Explorar o código

* cmdline/apt-get.cc:
- honor APT::Get::Only-Source properly in FindSrc() (thanks to
Martin Pitt for reporting the problem)
* Added more error handlings. Closes: #438803, #462734, #454989

Michael Vogt %!s(int64=17) %!d(string=hai) anos
pai
achega
973439b625
Modificáronse 2 ficheiros con 11 adicións e 3 borrados
  1. 2 2
      cmdline/apt-get.cc
  2. 9 1
      debian/changelog

+ 2 - 2
cmdline/apt-get.cc

@@ -1262,7 +1262,8 @@ pkgSrcRecords::Parser *FindSrc(const char *Name,pkgRecords &Recs,
    /* 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. */
-   if (_config->FindB("APT::Get::Only-Source") == false)
+   bool MatchSrcOnly = _config->FindB("APT::Get::Only-Source");
+   if (MatchSrcOnly == false)
    {
       if (Pkg.end() == false)
       {
@@ -1280,7 +1281,6 @@ pkgSrcRecords::Parser *FindSrc(const char *Name,pkgRecords &Recs,
    unsigned long Offset = 0;
    string Version;
    bool IsMatch = false;
-   bool MatchSrcOnly = false;
 
    // No source package name..
    if (Src.empty() == true)

+ 9 - 1
debian/changelog

@@ -1,3 +1,11 @@
+apt (0.7.23) unstable; urgency=low
+
+  * cmdline/apt-get.cc:
+    - honor APT::Get::Only-Source properly in FindSrc() (thanks to
+      Martin Pitt for reporting the problem)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 30 Jul 2009 15:27:30 +0200
+
 apt (0.7.22) unstable; urgency=low
 
   [ Christian Perrier ]
@@ -113,7 +121,7 @@ apt (0.7.22) unstable; urgency=low
   [ Osamu Aoki ]
   * Updated cron script to support backups by hardlinks and 
     verbose levels.  All features turned off by default. 
-  * Added more error handlings.  Closes: #438803, #462734, #454989, 
+  * Added more error handlings.  Closes: #438803, #462734, #454989
   * Documented all cron script related configuration items in 
     configure-index.