More fixes

Author: jgg
Date: 1999-05-29 03:32:30 GMT
More fixes

diff --git a/cmdline/apt-cdrom.cc b/cmdline/apt-cdrom.cc
index e1847be6eb3fd9e6c2bfbbfe49a8b69e4a20088a..7d723ba66943a5d71de37173e3336b55733475f9 100644 (file)
--- 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.22 1999/04/07 06:00:20 jgg Exp $
+// $Id: apt-cdrom.cc,v 1.23 1999/05/29 03:32:30 jgg Exp $
 /* ######################################################################
    
    APT CDROM - Tool for handling APT's CDROM database.
@@ -51,10 +51,17 @@ bool FindPackages(string CD,vector<string> &List,string &InfoDir,
    if (chdir(CD.c_str()) != 0)
       return _error->Errno("chdir","Unable to change to %s",CD.c_str());
 
+   // Look for a .disk subdirectory
+   struct stat Buf;
+   if (stat(".disk",&Buf) == 0)
+   {
+      if (InfoDir.empty() == true)
+        InfoDir = CD + ".disk/";
+   }
+
    /* Aha! We found some package files. We assume that everything under 
       this dir is controlled by those package files so we don't look down
       anymore */
-   struct stat Buf;
    if (stat("Packages",&Buf) == 0) 
    {
       List.push_back(CD);
@@ -63,13 +70,6 @@ bool FindPackages(string CD,vector<string> &List,string &InfoDir,
       if (_config->FindB("APT::CDROM::Thorough",false) == false)
         return true;
    }
-
-   // Look for a .disk subdirectory
-   if (stat(".disk",&Buf) == 0)
-   {
-      if (InfoDir.empty() == true)
-        InfoDir = CD + ".disk/";
-   }
    
    DIR *D = opendir(".");
    if (D == 0)
@@ -506,8 +506,13 @@ bool CopyPackages(string CDROM,string Name,vector<string> &List)
                     return false;
               }
               else
+              {
                  if (Target.Write(Start,Stop-Start) == false)
-                    return false;                
+                    return false;
+                 if (Stop[-1] != '\n')
+                    if (Target.Write("\n",1) == false)
+                       return false;
+              }               
            }
            if (Target.Write("\n",1) == false)
               return false;

diff --git a/debian/changelog b/debian/changelog
index 43b22ae403ff742b2c1961f4babc04896c97c42b..0c5acad2109a89ea6fdf69e82d9ec6219faa0720 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,9 @@ apt (0.3.6.1) unstable; urgency=low
   * Accounted for resumed files in the cps calculation. Closes: #36787
   * Deal with duplicate same version different packages. Closes: #30237
   * Added --no-download. Closes: #38095
+  * Order of apt-cdrom dist detection. Closes: #38139
+  * Fix apt-cdrom chop handling and missing lines. Closes: #37276
+  * IPv6 http support
   
  -- Jason Gunthorpe <jgg@debian.org>  Wed, 12 May 1999 09:18:49 -0700