merged from lp:~mvo/apt/mvo (that has all the changes from debian-experimental2)...

[apt.git] / cmdline / apt-get.cc

diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index 1925dea87102aac6082f0a61ac9b1a5a9948377c..d2e44aae083188549af9df1da0715f5224d0cb93 100644 (file)
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -2445,7 +2445,7 @@ bool DoSource(CommandLine &CmdL)
                  Src.c_str(), vcs.c_str(), uri.c_str());
         if(vcs == "Bzr") 
            ioprintf(c1out,_("Please use:\n"
-                            "bzr get %s\n"
+                            "bzr branch %s\n"
                             "to retrieve the latest (possibly unreleased) "
                             "updates to the package.\n"),
                     uri.c_str());
@@ -3137,7 +3137,10 @@ bool DownloadChangelog(CacheFile &CacheFile, pkgAcquire &Fetcher,
       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                                /*{{{*/