From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Thu, 18 Nov 2010 13:35:13 +0000 (+0100)
Subject: merged from the mvo branch
X-Git-Tag: 0.9.13.exp1ubuntu1~226
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/772ac84b17c98926046a96ea6042aad99c631aac?hp=-c

merged from the mvo branch
---

772ac84b17c98926046a96ea6042aad99c631aac
diff --combined cmdline/apt-get.cc
index 5a3275c15,6e1a5280c..8754744da
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@@ -2183,7 -2183,6 +2183,6 @@@ bool DoDownload(CommandLine &CmdL
     if (verset.empty() == true)
        return false;
  
-    bool result = true;
     pkgRecords Recs(Cache);
     pkgSourceList *SrcList = Cache.GetSourceList();
     for (APT::VersionSet::const_iterator Ver = verset.begin(); 
@@@ -2213,8 -2212,8 +2212,8 @@@
           hash = HashString("md5", rec.MD5Hash());
        // get the file
        new pkgAcqFile(&Fetcher, uri, hash.toStr(), (*Ver)->Size, descr, Pkg.Name(), ".");
-       result &= (Fetcher.Run() == pkgAcquire::Continue);
     }
+    bool result = (Fetcher.Run() == pkgAcquire::Continue);
  
     return result;
  }
@@@ -2891,10 -2890,7 +2890,10 @@@ bool DownloadChangelog(CacheFile &Cache
        return true;
  
     // error
 -   return _error->Error("changelog download failed");
 +   pkgRecords Recs(CacheFile);
 +   pkgRecords::Parser &rec=Recs.Lookup(Ver.FileList());
 +   string srcpkg = rec.SourcePkg().empty() ? Pkg.Name() : rec.SourcePkg();
 +   return _error->Error("changelog for this version is not (yet) available; try https://launchpad.net/ubuntu/+source/%s/+changelog", srcpkg.c_str());
  }
  									/*}}}*/
  // DisplayFileInPager - Display File with pager        			/*{{{*/