From c3ccac9232c2684b15f75fa8622a9a290aeca123 Mon Sep 17 00:00:00 2001
From: David Kalnischkies <david@kalnischkies.de>
Date: Thu, 27 Feb 2014 03:11:54 +0100
Subject: warning: no previous declaration for foobar()
 [-Wmissing-declarations]

Git-Dch: Ignore
Reported-By: gcc -Wmissing-declarations
---
 apt-private/private-list.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'apt-private/private-list.cc')

diff --git a/apt-private/private-list.cc b/apt-private/private-list.cc
index 44a766c84..bc4539aeb 100644
--- a/apt-private/private-list.cc
+++ b/apt-private/private-list.cc
@@ -99,7 +99,7 @@ private:
    #undef PackageMatcher
 };
 									/*}}}*/
-void ListAllVersions(pkgCacheFile &CacheFile, pkgRecords &records,	/*{{{*/
+static void ListAllVersions(pkgCacheFile &CacheFile, pkgRecords &records,/*{{{*/
                      pkgCache::PkgIterator P,    
                      std::ostream &outs,
                      bool include_summary=true)
-- 
cgit v1.2.3


From 453b82a388013e522b3a1b9fcd6ed0810dab1f4f Mon Sep 17 00:00:00 2001
From: David Kalnischkies <david@kalnischkies.de>
Date: Wed, 5 Mar 2014 22:11:25 +0100
Subject: cleanup headers and especially #includes everywhere

Beside being a bit cleaner it hopefully also resolves oddball problems
I have with high levels of parallel jobs.

Git-Dch: Ignore
Reported-By: iwyu (include-what-you-use)
---
 apt-private/private-list.cc | 43 ++++++++++++++-----------------------------
 1 file changed, 14 insertions(+), 29 deletions(-)

(limited to 'apt-private/private-list.cc')

diff --git a/apt-private/private-list.cc b/apt-private/private-list.cc
index bc4539aeb..7664ca134 100644
--- a/apt-private/private-list.cc
+++ b/apt-private/private-list.cc
@@ -1,43 +1,28 @@
 // Include Files							/*{{{*/
 #include <config.h>
 
-#include <apt-pkg/error.h>
 #include <apt-pkg/cachefile.h>
 #include <apt-pkg/cachefilter.h>
 #include <apt-pkg/cacheset.h>
-#include <apt-pkg/init.h>
-#include <apt-pkg/progress.h>
-#include <apt-pkg/sourcelist.h>
 #include <apt-pkg/cmndline.h>
-#include <apt-pkg/strutl.h>
-#include <apt-pkg/fileutl.h>
 #include <apt-pkg/pkgrecords.h>
-#include <apt-pkg/srcrecords.h>
-#include <apt-pkg/version.h>
-#include <apt-pkg/policy.h>
-#include <apt-pkg/tagfile.h>
-#include <apt-pkg/algorithms.h>
-#include <apt-pkg/sptr.h>
-#include <apt-pkg/pkgsystem.h>
-#include <apt-pkg/indexfile.h>
-#include <apt-pkg/metaindex.h>
+#include <apt-pkg/progress.h>
+#include <apt-pkg/strutl.h>
+#include <apt-pkg/configuration.h>
+#include <apt-pkg/macros.h>
+#include <apt-pkg/pkgcache.h>
+#include <apt-pkg/cacheiterators.h>
+
+#include <apt-private/private-cacheset.h>
+#include <apt-private/private-list.h>
+#include <apt-private/private-output.h>
 
+#include <iostream>
 #include <sstream>
-#include <vector>
+#include <map>
+#include <string>
 #include <utility>
-#include <cassert>
-#include <locale.h>
-#include <iostream>
-#include <unistd.h>
-#include <errno.h>
-#include <regex.h>
-#include <stdio.h>
-#include <algorithm>
-
-#include "private-cmndline.h"
-#include "private-list.h"
-#include "private-output.h"
-#include "private-cacheset.h"
+#include <vector>
 
 #include <apti18n.h>
 									/*}}}*/
-- 
cgit v1.2.3


From ec4371acb7bf586b4ed274b47813e5785da6b424 Mon Sep 17 00:00:00 2001
From: Michael Vogt <mvo@debian.org>
Date: Fri, 4 Apr 2014 12:16:22 +0200
Subject: Fix crash in "apt list" when a sources.list file is unreable

Closes: 743413
---
 apt-private/private-list.cc | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'apt-private/private-list.cc')

diff --git a/apt-private/private-list.cc b/apt-private/private-list.cc
index 7664ca134..b053cbcbe 100644
--- a/apt-private/private-list.cc
+++ b/apt-private/private-list.cc
@@ -99,14 +99,13 @@ static void ListAllVersions(pkgCacheFile &CacheFile, pkgRecords &records,/*{{{*/
 									/*}}}*/
 // list - list package based on criteria        			/*{{{*/
 // ---------------------------------------------------------------------
-bool List(CommandLine &Cmd)
+bool DoList(CommandLine &Cmd)
 {
    pkgCacheFile CacheFile;
    pkgCache *Cache = CacheFile.GetPkgCache();
-   pkgRecords records(CacheFile);
-
    if (unlikely(Cache == NULL))
       return false;
+   pkgRecords records(CacheFile);
 
    const char **patterns;
    const char *all_pattern[] = { "*", NULL};
-- 
cgit v1.2.3


From d6570f8577a955a6950ef9fe1ee9def401759336 Mon Sep 17 00:00:00 2001
From: Michael Vogt <mvo@ubuntu.com>
Date: Wed, 9 Apr 2014 16:23:14 +0200
Subject: Notice the user about "apt list -a" when only a single hit if found

If the user is using "apt list pattern" and there is only a single
hit, notice about "--all-versions" as this is what the user may
be interessted in
---
 apt-private/private-list.cc | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

(limited to 'apt-private/private-list.cc')

diff --git a/apt-private/private-list.cc b/apt-private/private-list.cc
index b053cbcbe..b69002103 100644
--- a/apt-private/private-list.cc
+++ b/apt-private/private-list.cc
@@ -130,10 +130,11 @@ bool DoList(CommandLine &Cmd)
                             Cache->Head().PackageCount,
                             _("Listing"));
    GetLocalitySortedVersionSet(CacheFile, bag, matcher, progress);
+   bool ShowAllVersions = _config->FindB("APT::Cmd::All-Versions", false);
    for (LocalitySortedVersionSet::iterator V = bag.begin(); V != bag.end(); ++V)
    {
       std::stringstream outs;
-      if(_config->FindB("APT::Cmd::All-Versions", false) == true)
+      if(ShowAllVersions == true)
       {
          ListAllVersions(CacheFile, records, V.ParentPkg(), outs, includeSummary);
          output_map.insert(std::make_pair<std::string, std::string>(
@@ -151,6 +152,18 @@ bool DoList(CommandLine &Cmd)
       std::cout << (*K).second << std::endl;
 
 
+   // be nice and tell the user if there is more to see
+   if (bag.size() == 1 && ShowAllVersions == false)
+   {
+      // start with -1 as we already displayed one version
+      int versions = -1;
+      pkgCache::VerIterator Ver = *bag.begin();
+      for ( ; Ver.end() == false; Ver++)
+         versions++;
+      if (versions > 0)
+         _error->Notice(P_("There is %i additional version. Please use the '-a' switch to see it", "There are %i additional versions. Please use the '-a' switch to see them.", versions), versions);
+   }
+
    return true;
 }
 
-- 
cgit v1.2.3