* apt-pkg/cdrom.cc:

  - handle Components in the reduction for the source.list as multi-arch cds
    otherwise create duplicated source entries (e.g. "wheezy main main")

diff --git a/apt-pkg/cdrom.cc b/apt-pkg/cdrom.cc
index 699f66fb3fa1618be373b036a9f2850c7625f8c8..8e746ee3013f16ad9ae4b02b521f3cc4f3368ccb 100644 (file)
--- a/apt-pkg/cdrom.cc
+++ b/apt-pkg/cdrom.cc
@@ -363,6 +363,7 @@ void pkgCdrom::ReduceSourcelist(string CD,vector<string> &List)
 
       string Word1 = string(*I,Space,SSpace-Space);
       string Prefix = string(*I,0,Space);
+      string Component = string(*I,SSpace);
       for (vector<string>::iterator J = List.begin(); J != I; ++J)
       {
         // Find a space..
@@ -377,9 +378,11 @@ void pkgCdrom::ReduceSourcelist(string CD,vector<string> &List)
            continue;
         if (string(*J,Space2,SSpace2-Space2) != Word1)
            continue;
-        
-        *J += string(*I,SSpace);
-        *I = string();
+
+        string Component2 = string(*J, SSpace2) + " ";
+        if (Component2.find(Component + " ") == std::string::npos)
+           *J += Component;
+        I->clear();
       }
    }   
 

diff --git a/debian/changelog b/debian/changelog
index 4533d27e37b9cd96d9b80e08b73f7a6eb1529fc6..703764dec6c88f1d13bb105a39c370d3d09a8951 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,9 @@ apt (0.9.7.5) UNRELEASED; urgency=low
   * apt-pkg/indexcopy.cc:
     - do not create duplicated flat-archive cdrom sources for foreign
       architectures on multi-arch cdroms
+  * apt-pkg/cdrom.cc:
+    - handle Components in the reduction for the source.list as multi-arch cds
+      otherwise create duplicated source entries (e.g. "wheezy main main")
 
  -- David Kalnischkies <kalnischkies@gmail.com>  Sun, 26 Aug 2012 10:49:17 +0200
 

diff --git a/test/libapt/cdromreducesourcelist_test.cc b/test/libapt/cdromreducesourcelist_test.cc
new file mode 100644 (file)
index 0000000..729da23
--- /dev/null
+++ b/test/libapt/cdromreducesourcelist_test.cc
@@ -0,0 +1,86 @@
+#include <apt-pkg/cdrom.h>
+#include <apt-pkg/error.h>
+
+#include <algorithm>
+#include <string>
+#include <vector>
+
+#include "assert.h"
+
+class Cdrom : public pkgCdrom {
+public:
+   std::vector<std::string> ReduceSourcelist(std::string CD,std::vector<std::string> List) {
+      pkgCdrom::ReduceSourcelist(CD, List);
+      return List;
+   }
+};
+
+int main(int argc, char const *argv[]) {
+   Cdrom cd;
+   std::vector<std::string> List;
+   std::string CD("/media/cdrom/");
+
+   std::vector<std::string> R = cd.ReduceSourcelist(CD, List);
+   equals(R.empty(), true);
+
+   List.push_back(" wheezy main");
+   R = cd.ReduceSourcelist(CD, List);
+   equals(R.size(), 1);
+   equals(R[0], " wheezy main");
+
+   List.push_back(" wheezy main");
+   R = cd.ReduceSourcelist(CD, List);
+   equals(R.size(), 1);
+   equals(R[0], " wheezy main");
+
+   List.push_back(" wheezy contrib");
+   R = cd.ReduceSourcelist(CD, List);
+   equals(R.size(), 1);
+   equals(R[0], " wheezy contrib main");
+
+   List.push_back(" wheezy-update contrib");
+   R = cd.ReduceSourcelist(CD, List);
+   equals(R.size(), 2);
+   equals(R[0], " wheezy contrib main");
+   equals(R[1], " wheezy-update contrib");
+
+   List.push_back(" wheezy-update contrib");
+   R = cd.ReduceSourcelist(CD, List);
+   equals(R.size(), 2);
+   equals(R[0], " wheezy contrib main");
+   equals(R[1], " wheezy-update contrib");
+
+   List.push_back(" wheezy-update non-free");
+   R = cd.ReduceSourcelist(CD, List);
+   equals(R.size(), 2);
+   equals(R[0], " wheezy contrib main");
+   equals(R[1], " wheezy-update contrib non-free");
+
+   List.push_back(" wheezy-update main");
+   R = cd.ReduceSourcelist(CD, List);
+   equals(R.size(), 2);
+   equals(R[0], " wheezy contrib main");
+   equals(R[1], " wheezy-update contrib main non-free");
+
+   List.push_back(" wheezy non-free");
+   R = cd.ReduceSourcelist(CD, List);
+   equals(R.size(), 2);
+   equals(R[0], " wheezy contrib main non-free");
+   equals(R[1], " wheezy-update contrib main non-free");
+
+   List.push_back(" sid main");
+   R = cd.ReduceSourcelist(CD, List);
+   equals(R.size(), 3);
+   equals(R[0], " sid main");
+   equals(R[1], " wheezy contrib main non-free");
+   equals(R[2], " wheezy-update contrib main non-free");
+
+   List.push_back(" sid main-reduce");
+   R = cd.ReduceSourcelist(CD, List);
+   equals(R.size(), 3);
+   equals(R[0], " sid main main-reduce");
+   equals(R[1], " wheezy contrib main non-free");
+   equals(R[2], " wheezy-update contrib main non-free");
+
+   return 0;
+}

diff --git a/test/libapt/makefile b/test/libapt/makefile
index d4d7f175bb30f14b6484cdf1901b0ebab024551a..5e225f2404880bedbaf25e9e7e48d0a779ff9e25 100644 (file)
--- a/test/libapt/makefile
+++ b/test/libapt/makefile
@@ -87,6 +87,12 @@ SLIBS = -lapt-pkg
 SOURCE = cdromfindpackages_test.cc
 include $(PROGRAM_H)
 
+# test cdroms index reduction for source.list
+PROGRAM = CdromReduceSourceList${BASENAME}
+SLIBS = -lapt-pkg
+SOURCE = cdromreducesourcelist_test.cc
+include $(PROGRAM_H)
+
 # text IndexCopy::ConvertToSourceList
 PROGRAM = IndexCopyToSourceList${BASENAME}
 SLIBS = -lapt-pkg