diff options
| author | Arch Librarian <arch@canonical.com> | 2004-09-20 16:53:55 +0000 |
|---|---|---|
| committer | Arch Librarian <arch@canonical.com> | 2004-09-20 16:53:55 +0000 |
| commit | d44d5144f27e844f7e48f88c0e9c5fa718956d34 (patch) | |
| tree | 3a9af0f5f201c2e0cd9e60117fd1ef2b43d1bfa5 | |
| parent | 6b8f78a12276e75d0da3578301d4da378963185f (diff) | |
Fixed apt-cdrom and the control file
Author: jgg
Date: 1999-05-29 21:49:58 GMT
Fixed apt-cdrom and the control file
| -rw-r--r-- | cmdline/apt-cdrom.cc | 5 | ||||
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | debian/control | 1 | ||||
| -rw-r--r-- | doc/examples/sources.list | 2 |
4 files changed, 6 insertions, 3 deletions
diff --git a/cmdline/apt-cdrom.cc b/cmdline/apt-cdrom.cc index 49c7909dc..dd45e9b48 100644 --- a/cmdline/apt-cdrom.cc +++ b/cmdline/apt-cdrom.cc @@ -1,6 +1,6 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: apt-cdrom.cc,v 1.24 1999/05/29 04:59:52 jgg Exp $ +// $Id: apt-cdrom.cc,v 1.25 1999/05/29 21:49:58 jgg Exp $ /* ###################################################################### APT CDROM - Tool for handling APT's CDROM database. @@ -468,7 +468,8 @@ bool CopyPackages(string CDROM,string Name,vector<string> &List) // Get the size struct stat Buf; - if (stat(string(CDROM + Prefix + File).c_str(),&Buf) != 0) + if (stat(string(CDROM + Prefix + File).c_str(),&Buf) != 0 || + Buf.st_size == 0) { // Attempt to fix busted symlink support for one instance string OrigFile = File; diff --git a/debian/changelog b/debian/changelog index 0c5acad21..b96b3a53c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,6 +19,7 @@ apt (0.3.6.1) unstable; urgency=low * Order of apt-cdrom dist detection. Closes: #38139 * Fix apt-cdrom chop handling and missing lines. Closes: #37276 * IPv6 http support + * Suggests dpkg-dev for apt-get source. Closes: #38158 -- Jason Gunthorpe <jgg@debian.org> Wed, 12 May 1999 09:18:49 -0700 diff --git a/debian/control b/debian/control index b1ec77cbc..f460aa532 100644 --- a/debian/control +++ b/debian/control @@ -11,6 +11,7 @@ Priority: standard Conflicts: deity Replaces: deity Provides: libapt-pkg${libapt-pkg:major} +Suggests: dpkg-dev Description: Advanced front-end for dpkg This is Debian's next generation front-end for the dpkg package manager. It provides the apt-get utility and APT dselect method that provides a diff --git a/doc/examples/sources.list b/doc/examples/sources.list index 0fcc006d4..34de62161 100644 --- a/doc/examples/sources.list +++ b/doc/examples/sources.list @@ -1,4 +1,4 @@ # See sources.list(5) for more information # Remember that you can only use http, ftp or file URIs deb http://ftp1.us.debian.org/debian unstable main contrib non-free -deb http://non-us.debian.org/debian-non-US unstable non-US +deb http://non-us.debian.org/debian-non-US unstable non-US/main non-US/contrib non-US/non-free |