* Exclude subdirectories named 'debian-installer' from ...

Author: mdz
Date: 2003-09-12 01:48:33 GMT
* Exclude subdirectories named 'debian-installer' from the apt-cdrom
search (Closes: #210485)

diff --git a/cmdline/apt-cdrom.cc b/cmdline/apt-cdrom.cc
index 35430f57566c0956f199dc7b94fbf7c4ecd42f88..ccb5af766ace84b1068242949135233a9b61748e 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.43 2003/04/26 23:26:13 doogie Exp $
+// $Id: apt-cdrom.cc,v 1.44 2003/09/12 01:48:33 mdz Exp $
 /* ######################################################################
    
    APT CDROM - Tool for handling APT's CDROM database.
@@ -101,7 +101,8 @@ bool FindPackages(string CD,vector<string> &List,vector<string> &SList,
          //strcmp(Dir->d_name,"source") == 0 ||
          strcmp(Dir->d_name,".disk") == 0 ||
          strcmp(Dir->d_name,"experimental") == 0 ||
-         strcmp(Dir->d_name,"binary-all") == 0)
+         strcmp(Dir->d_name,"binary-all") == 0 ||
+          strcmp(Dir->d_name,"debian-installer") == 0)
         continue;
 
       // See if the name is a sub directory

diff --git a/debian/changelog b/debian/changelog
index 8350699c6327670c59c5656dc61a201975ea8f92..28bef28ae91cb70e7254167f9fb58542b3e497b1 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+apt (0.5.12) unstable; urgency=low
+
+  * Exclude subdirectories named 'debian-installer' from the apt-cdrom
+    search (Closes: #210485)
+
+ -- Matt Zimmerman <mdz@debian.org>  Thu, 11 Sep 2003 21:48:14 -0400
+
 apt (0.5.11) unstable; urgency=low
 
   * Updated pt_BR translations from Andre Luis Lopes <andrelop@debian.org>