Browse Source

* cmdline/apt-get.cc:

- print URIs for all changelogs in case of --print-uris,
    thanks to Daniel Hartwig for the patch! (Closes: #674897)
debian/1.8.y
Daniel Hartwig 10 years ago
committed by David Kalnischkies
parent
commit
a98b661525
  1. 6
      cmdline/apt-get.cc
  2. 2
      debian/changelog
  3. 3
      test/integration/test-apt-get-changelog

6
cmdline/apt-get.cc

@ -3244,9 +3244,13 @@ bool DoChangelog(CommandLine &CmdL)
pkgAcquire Fetcher;
if (_config->FindB("APT::Get::Print-URIs", false) == true)
{
bool Success = true;
for (APT::VersionList::const_iterator Ver = verset.begin();
Ver != verset.end(); ++Ver)
return DownloadChangelog(Cache, Fetcher, Ver, "");
Success &= DownloadChangelog(Cache, Fetcher, Ver, "");
return Success;
}
AcqTextStatus Stat(ScreenWidth, _config->FindI("quiet",0));
Fetcher.Setup(&Stat);

2
debian/changelog

@ -8,6 +8,8 @@ apt (0.9.5.2) UNRELEASED; urgency=low
* cmdline/apt-get.cc:
- do not show 'list of broken packages' header if no package
is broken as it happens e.g. for external resolver errors
- print URIs for all changelogs in case of --print-uris,
thanks to Daniel Hartwig for the patch! (Closes: #674897)
* debian/apt-utils.links:
- the internal resolver 'apt' is now directly installed in
/usr/lib/apt/solvers, so don't instruct dh to create a broken link

3
test/integration/test-apt-get-changelog

@ -17,6 +17,9 @@ echo 'Apt::Changelogs::Server "http://localhost:8080/";' >> ./aptconfig.conf
testequal "'http://localhost:8080//pool/apt_1.0/changelog'" aptget changelog apt --print-uris
testequal "'http://localhost:8080//pool/apt_1.0/changelog'
'http://localhost:8080//pool/apt_1.0/changelog'" aptget changelog apt apt --print-uris
aptget changelog apt -qq > apt.changelog
testfileequal 'apt.changelog' "$(cat aptarchive/pool/apt_1.0/changelog)"
rm apt.changelog

Loading…
Cancel
Save