From a0e710af5b290b6d6dd5357c448698d2d91bcc72 Mon Sep 17 00:00:00 2001
From: Arch Librarian <arch@canonical.com>
Date: Mon, 20 Sep 2004 17:04:49 +0000
Subject: Don't use the Archive name in madison; it won't be uniq... Author:
 mdz Date: 2004-01-04 19:00:10 GMT Don't use the Archive name in madison; it
 won't be unique and there isn't space for both that and the source
 description

---
 cmdline/apt-cache.cc | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

(limited to 'cmdline')

diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc
index a8db900a1..de7b95476 100644
--- a/cmdline/apt-cache.cc
+++ b/cmdline/apt-cache.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description								/*{{{*/
-// $Id: apt-cache.cc,v 1.70 2004/01/04 07:41:52 mdz Exp $
+// $Id: apt-cache.cc,v 1.71 2004/01/04 19:00:10 mdz Exp $
 /* ######################################################################
    
    apt-cache - Manages the cache files
@@ -1589,21 +1589,20 @@ bool Madison(CommandLine &CmdL)
          {
             for (pkgCache::VerFileIterator VF = V.FileList(); VF.end() == false; VF++)
             {
-               if (VF.File().Archive() != 0)
+// This might be nice, but wouldn't uniquely identify the source -mdz
+//                if (VF.File().Archive() != 0)
+//                {
+//                   cout << setw(10) << Pkg.Name() << " | " << setw(10) << V.VerStr() << " | "
+//                        << VF.File().Archive() << endl;
+//                }
+
+               // Locate the associated index files so we can derive a description
+               for (pkgSourceList::const_iterator S = SrcList->begin(); S != SrcList->end(); S++)
                {
-                  cout << setw(10) << Pkg.Name() << " | " << setw(10) << V.VerStr() << " | "
-                       << VF.File().Archive() << endl;
-               }
-               else
-               {
-                  // Locate the associated index files so we can derive a description
-                  for (pkgSourceList::const_iterator S = SrcList->begin(); S != SrcList->end(); S++)
+                  if ((*S)->FindInCache(*(VF.File().Cache())) == VF.File())
                   {
-                     if ((*S)->FindInCache(*(VF.File().Cache())) == VF.File())
-                     {
-                        cout << setw(10) << Pkg.Name() << " | " << setw(10) << V.VerStr() << " | "
-                             << (*S)->Describe(true) << endl;
-                     }
+                     cout << setw(10) << Pkg.Name() << " | " << setw(10) << V.VerStr() << " | "
+                          << (*S)->Describe(true) << endl;
                   }
                }
             }
-- 
cgit v1.2.3