Fixed apt-cdrom and the control file

Author: jgg
Date: 1999-05-29 21:49:58 GMT
Fixed apt-cdrom and the control file

diff --git a/cmdline/apt-cdrom.cc b/cmdline/apt-cdrom.cc
index 49c7909dc9c9591b39ba27fba2c38d7d96a1f580..dd45e9b484d52bd31ab89a2b3882259d38cd0458 100644 (file)
--- a/cmdline/apt-cdrom.cc
+++ b/cmdline/apt-cdrom.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- 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.
 /* ######################################################################
    
    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;
            
            // 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;
            {
               // Attempt to fix busted symlink support for one instance
               string OrigFile = File;

diff --git a/debian/changelog b/debian/changelog
index 0c5acad2109a89ea6fdf69e82d9ec6219faa0720..b96b3a53c7e46f25af444c12ed6d38514d4e0af5 100644 (file)
--- 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
   * 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
  
   
  -- Jason Gunthorpe <jgg@debian.org>  Wed, 12 May 1999 09:18:49 -0700
  

diff --git a/debian/control b/debian/control
index b1ec77cbc5fb02466ae1c91aa356e0de3ffebd2e..f460aa532a86bfcbdfe86aef9fb0a64fe3d843d7 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -11,6 +11,7 @@ Priority: standard
 Conflicts: deity
 Replaces: deity
 Provides: libapt-pkg${libapt-pkg:major}
 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 
 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 0fcc006d40702e9f5c10372525f87e704f8f62cd..34de6216183fa79c8fa08f8a44eb59365b7d6ca7 100644 (file)
--- 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
 # 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