merge with lp:~mvo/apt/debian-sid : move all my ABI break changes

to the "new" 0.7.26 version

2 files changed, 148 insertions, 132 deletions

diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index 7325bbf22..f84c82d28 100644
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -1247,131 +1247,143 @@ pkgSrcRecords::Parser *FindSrc(const char *Name,pkgRecords &Recs,
 			       pkgSrcRecords &SrcRecs,string &Src,
 			       pkgDepCache &Cache)
 {
-	string VerTag;
-	string DefRel = _config->Find("APT::Default-Release");
-	string TmpSrc = Name;
-	const size_t found = TmpSrc.find_last_of("/=");
-
-	// extract the version/release from the pkgname
-	if (found != string::npos) {
-		if (TmpSrc[found] == '/')
-			DefRel = TmpSrc.substr(found+1);
-		else
-			VerTag = TmpSrc.substr(found+1);
-		TmpSrc = TmpSrc.substr(0,found);
-	}
-
-	/* Lookup the version of the package we would install if we were to
-	   install a version and determine the source package name, then look
-	   in the archive for a source package of the same name. */
-	bool MatchSrcOnly = _config->FindB("APT::Get::Only-Source");
-	const pkgCache::PkgIterator Pkg = Cache.FindPkg(TmpSrc);
-	if (MatchSrcOnly == false && Pkg.end() == false) {
-		if(VerTag.empty() == false || DefRel.empty() == false) {
-			// we have a default release, try to locate the pkg. we do it like
-			// this because GetCandidateVer() will not "downgrade", that means
-			// "apt-get source -t stable apt" won't work on a unstable system
-			for (pkgCache::VerIterator Ver = Pkg.VersionList();
-			     Ver.end() == false; Ver++) {
-				for (pkgCache::VerFileIterator VF = Ver.FileList();
-				     VF.end() == false; VF++) {
-					/* If this is the status file, and the current version is not the
-					   version in the status file (ie it is not installed, or somesuch)
-					   then it is not a candidate for installation, ever. This weeds
-					   out bogus entries that may be due to config-file states, or
-					   other. */
-					if ((VF.File()->Flags & pkgCache::Flag::NotSource) ==
-					    pkgCache::Flag::NotSource && Pkg.CurrentVer() != Ver)
-						continue;
-
-					// We match against a concrete version (or a part of this version)
-					if (VerTag.empty() == false && strncmp(VerTag.c_str(), Ver.VerStr(), VerTag.size()) != 0)
-						continue;
-
-					// or we match against a release
-					if(VerTag.empty() == false ||
-					   (VF.File().Archive() != 0 && VF.File().Archive() == DefRel) ||
-					   (VF.File().Codename() != 0 && VF.File().Codename() == DefRel)) {
-						pkgRecords::Parser &Parse = Recs.Lookup(VF);
-						Src = Parse.SourcePkg();
-						if (VerTag.empty() == true)
-							VerTag = Parse.SourceVer();
-						break;
-					}
-				}
-			}
-			if (Src.empty() == true) {
-				if (VerTag.empty() == false)
-					_error->Warning(_("Ignore unavailable version '%s' of package '%s'"), VerTag.c_str(), TmpSrc.c_str());
-				else
-					_error->Warning(_("Ignore unavailable target release '%s' of package '%s'"), DefRel.c_str(), TmpSrc.c_str());
-				VerTag.clear();
-				DefRel.clear();
-			}
-		}
-		if (VerTag.empty() == true && DefRel.empty() == true) {
-			// if we don't have a version or default release, use the CandidateVer to find the Source
-			pkgCache::VerIterator Ver = Cache.GetCandidateVer(Pkg);
-			if (Ver.end() == false) {
-				pkgRecords::Parser &Parse = Recs.Lookup(Ver.FileList());
-				Src = Parse.SourcePkg();
-				VerTag = Parse.SourceVer();
-			}
-		}
-	}
-
-	if (Src.empty() == true)
-		Src = TmpSrc;
-	else {
-		/* if we have a source pkg name, make sure to only search
-		   for srcpkg names, otherwise apt gets confused if there
-		   is a binary package "pkg1" and a source package "pkg1"
-		   with the same name but that comes from different packages */
-		MatchSrcOnly = true;
-		if (Src != TmpSrc) {
-			ioprintf(c1out, _("Picking '%s' as source package instead of '%s'\n"), Src.c_str(), TmpSrc.c_str());
-		}
-	}
-
-	// The best hit
-	pkgSrcRecords::Parser *Last = 0;
-	unsigned long Offset = 0;
-	string Version;
-
-	/* Iterate over all of the hits, which includes the resulting
-	   binary packages in the search */
-	pkgSrcRecords::Parser *Parse;
-	while (true) {
-		SrcRecs.Restart();
-		while ((Parse = SrcRecs.Find(Src.c_str(), MatchSrcOnly)) != 0) {
-			const string Ver = Parse->Version();
-
-			// Ignore all versions which doesn't fit
-			if (VerTag.empty() == false && strncmp(VerTag.c_str(), Ver.c_str(), VerTag.size()) != 0)
-				continue;
-
-			// Newer version or an exact match? Save the hit
-			if (Last == 0 || Cache.VS().CmpVersion(Version,Ver) < 0) {
-				Last = Parse;
-				Offset = Parse->Offset();
-				Version = Ver;
-			}
-
-			// was the version check above an exact match? If so, we don't need to look further
-			if (VerTag.empty() == false && VerTag.size() == Ver.size())
-				break;
-		}
-		if (Last != 0 || VerTag.empty() == true)
-			break;
-		//if (VerTag.empty() == false && Last == 0)
-		_error->Warning(_("Ignore unavailable version '%s' of package '%s'"), VerTag.c_str(), TmpSrc.c_str());
-		VerTag.clear();
-	}
-
-	if (Last == 0 || Last->Jump(Offset) == false)
-		return 0;
-
-	return Last;
+   string VerTag;
+   string DefRel = _config->Find("APT::Default-Release");
+   string TmpSrc = Name;
+
+   // extract the version/release from the pkgname
+   const size_t found = TmpSrc.find_last_of("/=");
+   if (found != string::npos) {
+      if (TmpSrc[found] == '/')
+	 DefRel = TmpSrc.substr(found+1);
+      else
+	 VerTag = TmpSrc.substr(found+1);
+      TmpSrc = TmpSrc.substr(0,found);
+   }
+
+   /* Lookup the version of the package we would install if we were to
+      install a version and determine the source package name, then look
+      in the archive for a source package of the same name. */
+   bool MatchSrcOnly = _config->FindB("APT::Get::Only-Source");
+   const pkgCache::PkgIterator Pkg = Cache.FindPkg(TmpSrc);
+   if (MatchSrcOnly == false && Pkg.end() == false) 
+   {
+      if(VerTag.empty() == false || DefRel.empty() == false) 
+      {
+	 // we have a default release, try to locate the pkg. we do it like
+	 // this because GetCandidateVer() will not "downgrade", that means
+	 // "apt-get source -t stable apt" won't work on a unstable system
+	 for (pkgCache::VerIterator Ver = Pkg.VersionList();
+	      Ver.end() == false; Ver++) 
+	 {
+	    for (pkgCache::VerFileIterator VF = Ver.FileList();
+		 VF.end() == false; VF++) 
+	    {
+	       /* If this is the status file, and the current version is not the
+		  version in the status file (ie it is not installed, or somesuch)
+		  then it is not a candidate for installation, ever. This weeds
+		  out bogus entries that may be due to config-file states, or
+		  other. */
+	       if ((VF.File()->Flags & pkgCache::Flag::NotSource) ==
+		   pkgCache::Flag::NotSource && Pkg.CurrentVer() != Ver)
+		  continue;
+
+	       // We match against a concrete version (or a part of this version)
+	       if (VerTag.empty() == false && strncmp(VerTag.c_str(), Ver.VerStr(), VerTag.size()) != 0)
+		  continue;
+
+	       // or we match against a release
+	       if(VerTag.empty() == false ||
+		  (VF.File().Archive() != 0 && VF.File().Archive() == DefRel) ||
+		  (VF.File().Codename() != 0 && VF.File().Codename() == DefRel)) 
+	       {
+		  pkgRecords::Parser &Parse = Recs.Lookup(VF);
+		  Src = Parse.SourcePkg();
+		  if (VerTag.empty() == true)
+		     VerTag = Parse.SourceVer();
+		  break;
+	       }
+	    }
+	 }
+	 if (Src.empty() == true) 
+	 {
+	    if (VerTag.empty() == false)
+	       _error->Warning(_("Ignore unavailable version '%s' of package '%s'"), VerTag.c_str(), TmpSrc.c_str());
+	    else
+	       _error->Warning(_("Ignore unavailable target release '%s' of package '%s'"), DefRel.c_str(), TmpSrc.c_str());
+	    VerTag.clear();
+	    DefRel.clear();
+	 }
+      }
+      if (VerTag.empty() == true && DefRel.empty() == true) 
+      {
+	 // if we don't have a version or default release, use the CandidateVer to find the Source
+	 pkgCache::VerIterator Ver = Cache.GetCandidateVer(Pkg);
+	 if (Ver.end() == false) 
+	 {
+	    pkgRecords::Parser &Parse = Recs.Lookup(Ver.FileList());
+	    Src = Parse.SourcePkg();
+	    VerTag = Parse.SourceVer();
+	 }
+      }
+   }
+
+   if (Src.empty() == true)
+      Src = TmpSrc;
+   else 
+   {
+      /* if we have a source pkg name, make sure to only search
+	 for srcpkg names, otherwise apt gets confused if there
+	 is a binary package "pkg1" and a source package "pkg1"
+	 with the same name but that comes from different packages */
+      MatchSrcOnly = true;
+      if (Src != TmpSrc) 
+      {
+	 ioprintf(c1out, _("Picking '%s' as source package instead of '%s'\n"), Src.c_str(), TmpSrc.c_str());
+      }
+   }
+
+   // The best hit
+   pkgSrcRecords::Parser *Last = 0;
+   unsigned long Offset = 0;
+   string Version;
+
+   /* Iterate over all of the hits, which includes the resulting
+      binary packages in the search */
+   pkgSrcRecords::Parser *Parse;
+   while (true) 
+   {
+      SrcRecs.Restart();
+      while ((Parse = SrcRecs.Find(Src.c_str(), MatchSrcOnly)) != 0) 
+      {
+	 const string Ver = Parse->Version();
+
+	 // Ignore all versions which doesn't fit
+	 if (VerTag.empty() == false && strncmp(VerTag.c_str(), Ver.c_str(), VerTag.size()) != 0)
+	    continue;
+
+	 // Newer version or an exact match? Save the hit
+	 if (Last == 0 || Cache.VS().CmpVersion(Version,Ver) < 0) {
+	    Last = Parse;
+	    Offset = Parse->Offset();
+	    Version = Ver;
+	 }
+
+	 // was the version check above an exact match? If so, we don't need to look further
+	 if (VerTag.empty() == false && VerTag.size() == Ver.size())
+	    break;
+      }
+      if (Last != 0 || VerTag.empty() == true)
+	 break;
+      //if (VerTag.empty() == false && Last == 0)
+      _error->Warning(_("Ignore unavailable version '%s' of package '%s'"), VerTag.c_str(), TmpSrc.c_str());
+      VerTag.clear();
+   }
+
+   if (Last == 0 || Last->Jump(Offset) == false)
+      return 0;
+
+   return Last;
 }
 									/*}}}*/
 // DoUpdate - Update the package lists					/*{{{*/
diff --git a/cmdline/apt-key b/cmdline/apt-key
index 7bb30240e..5f4e02fdf 100755
--- a/cmdline/apt-key
+++ b/cmdline/apt-key
@@ -93,13 +93,17 @@ update() {
     # add any security. we *need* this check on net-update though
     $GPG_CMD --quiet --batch --keyring $ARCHIVE_KEYRING --export | $GPG --import
 
-    # remove no-longer supported/used keys
-    keys=`$GPG_CMD --keyring $REMOVED_KEYS --with-colons --list-keys | grep ^pub | cut -d: -f5`
-    for key in $keys; do
-	if $GPG --list-keys --with-colons | grep ^pub | cut -d: -f5 | grep -q $key; then
-	    $GPG --quiet --batch --delete-key --yes ${key}
-	fi
-    done
+    if [ -r "$REMOVED_KEYS" ]; then
+	# remove no-longer supported/used keys
+	keys=`$GPG_CMD --keyring $REMOVED_KEYS --with-colons --list-keys | grep ^pub | cut -d: -f5`
+	for key in $keys; do
+	    if $GPG --list-keys --with-colons | grep ^pub | cut -d: -f5 | grep -q $key; then
+		$GPG --quiet --batch --delete-key --yes ${key}
+	    fi
+	done
+    else
+	echo "Warning: removed keys keyring  $REMOVED_KEYS missing or not readable" >&2
+    fi
 }