From cd907113561d5eb75054f981be3bcc22eee8db27 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 3 Feb 2016 12:58:23 +0100 Subject: [PATCH] use pkgCache::VS instead of pkgDepCache::VS() The later just calls the earlier, but the later needs the fullblown dependency cache to be initialized, which is a very costly operation and isn't done anymore that early in the run as we would need to throw away and rebuild it again after we got all the information about source pkgs. As we end up with a nullptr for the pkgDepCache, we use a slightly longer calling convention to make sure that we use the pkgCache directly, avoiding nullptr induced segfaults and costly operations. Git-Dch: Ignore Reported-By: Balint Reczey --- apt-private/private-source.cc | 10 +-- ...-build-dep => test-apt-get-build-dep-file} | 0 ...t-source => test-apt-source-and-build-dep} | 80 ++++++++++++++----- 3 files changed, 63 insertions(+), 27 deletions(-) rename test/integration/{test-apt-get-build-dep => test-apt-get-build-dep-file} (100%) rename test/integration/{test-apt-get-source => test-apt-source-and-build-dep} (62%) diff --git a/apt-private/private-source.cc b/apt-private/private-source.cc index c45af6651..c2f5f5d3a 100644 --- a/apt-private/private-source.cc +++ b/apt-private/private-source.cc @@ -152,12 +152,12 @@ static pkgSrcRecords::Parser *FindSrc(const char *Name, // pick highest version for the arch unless the user wants // something else if (ArchTag != "" && VerTag == "" && RelTag == "") - if(Cache->VS().CmpVersion(VerTag, Ver.VerStr()) < 0) + if(Cache.GetPkgCache()->VS->CmpVersion(VerTag, Ver.VerStr()) < 0) VerTag = Ver.VerStr(); // We match against a concrete version (or a part of this version) if (VerTag.empty() == false && - (fuzzy == true || Cache->VS().CmpVersion(VerTag, Ver.VerStr()) != 0) && // exact match + (fuzzy == true || Cache.GetPkgCache()->VS->CmpVersion(VerTag, Ver.VerStr()) != 0) && // exact match (fuzzy == false || strncmp(VerTag.c_str(), Ver.VerStr(), VerTag.size()) != 0)) // fuzzy match continue; @@ -275,11 +275,11 @@ static pkgSrcRecords::Parser *FindSrc(const char *Name, // Ignore all versions which doesn't fit if (VerTag.empty() == false && - Cache->VS().CmpVersion(VerTag, Ver) != 0) // exact match + Cache.GetPkgCache()->VS->CmpVersion(VerTag, Ver) != 0) // exact match continue; // Newer version or an exact match? Save the hit - if (Last == 0 || Cache->VS().CmpVersion(Version,Ver) < 0) { + if (Last == 0 || Cache.GetPkgCache()->VS->CmpVersion(Version,Ver) < 0) { Last = Parse; Offset = Parse->Offset(); Version = Ver; @@ -514,7 +514,7 @@ bool DoSource(CommandLine &CmdL) bool const fixBroken = _config->FindB("APT::Get::Fix-Broken", false); for (unsigned I = 0; I != J; ++I) { - std::string Dir = Dsc[I].Package + '-' + Cache->VS().UpstreamVersion(Dsc[I].Version.c_str()); + std::string Dir = Dsc[I].Package + '-' + Cache.GetPkgCache()->VS->UpstreamVersion(Dsc[I].Version.c_str()); // Diff only mode only fetches .diff files if (_config->FindB("APT::Get::Diff-Only",false) == true || diff --git a/test/integration/test-apt-get-build-dep b/test/integration/test-apt-get-build-dep-file similarity index 100% rename from test/integration/test-apt-get-build-dep rename to test/integration/test-apt-get-build-dep-file diff --git a/test/integration/test-apt-get-source b/test/integration/test-apt-source-and-build-dep similarity index 62% rename from test/integration/test-apt-get-source rename to test/integration/test-apt-source-and-build-dep index 4b5375d0c..a813cfe39 100755 --- a/test/integration/test-apt-get-source +++ b/test/integration/test-apt-source-and-build-dep @@ -5,11 +5,11 @@ TESTDIR="$(readlink -f "$(dirname "$0")")" . "$TESTDIR/framework" setupenvironment -configarchitecture "i386" +configarchitecture 'i386' # we need to insert a package into "unstable" so that a Release file is # create for the test -insertpackage 'wheezy' 'unreleated-package' 'all' '1.0' +insertpackage 'wheezy' 'build-essential' 'all' '1.0' # a "normal" package with source and binary insertpackage 'unstable' 'foo' 'all' '2.0' @@ -70,41 +70,65 @@ DOWNLOAD4="Need to get 0 B/25 B of source archives. 'file://${APTARCHIVE}/baz_2.0.dsc' baz_2.0.dsc 11 SHA256:47d062d29070b3f592d1c8aed8c1e7913804bbb67ca1d64877c8219dac5e0420 'file://${APTARCHIVE}/baz_2.0.tar.gz' baz_2.0.tar.gz 14 SHA256:11c1b202c94a64ab6433d9f0ed5515fce1dc7b20e6bcf51cec9ef8b9455f5a41" testsuccessequal "$HEADER -$DOWNLOAD2" aptget source -q --print-uris foo +$DOWNLOAD2" apt source -q --print-uris foo testsuccessequal "$HEADER -$DOWNLOAD2" aptget source -q --print-uris foo foo +$DOWNLOAD2" apt source -q --print-uris foo foo +getbuilddep() { + echo 'Reading package lists...' + if [ -n "$2" ]; then + echo "$2" + fi + echo "${1} has no build depends. +Reading package lists... +Building dependency tree... +The following NEW packages will be installed: + build-essential +0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded. +Inst build-essential (1.0 wheezy [all]) +Conf build-essential (1.0 wheezy [all])" +} +testsuccessequal "$(getbuilddep 'foo')" apt build-dep foo -s # select by release: suite testsuccessequal "$HEADER Selected version '1.0' (stable) for foo -$DOWNLOAD1" aptget source -q --print-uris foo/stable +$DOWNLOAD1" apt source -q --print-uris foo/stable +testsuccessequal "$(getbuilddep 'foo' "Selected version '1.0' (stable) for foo")" apt build-dep foo/stable -s testsuccessequal "$HEADER Selected version '2.0' (unstable) for foo -$DOWNLOAD2" aptget source -q --print-uris foo/unstable +$DOWNLOAD2" apt source -q --print-uris foo/unstable +testsuccessequal "$(getbuilddep 'foo' "Selected version '2.0' (unstable) for foo")" apt build-dep foo/unstable -s testsuccessequal "$HEADER Selected version '1.0' (stable) for foo -$DOWNLOAD1" aptget source -q --print-uris foo -t stable +$DOWNLOAD1" apt source -q --print-uris foo -t stable +testsuccessequal "$(getbuilddep 'foo' "Selected version '1.0' (stable) for foo")" apt build-dep foo -t stable -s testsuccessequal "$HEADER Selected version '2.0' (unstable) for foo -$DOWNLOAD2" aptget source -q --print-uris foo -t unstable +$DOWNLOAD2" apt source -q --print-uris foo -t unstable +testsuccessequal "$(getbuilddep 'foo' "Selected version '2.0' (unstable) for foo")" apt build-dep foo -t unstable -s testsuccessequal "$HEADER Selected version '1.0' (stable) for baz -$DOWNLOAD3" aptget source -q --print-uris baz -t stable +$DOWNLOAD3" apt source -q --print-uris baz -t stable +testsuccessequal "$(getbuilddep 'baz' "Selected version '1.0' (stable) for baz")" apt build-dep baz -t stable -s # select by release: codename testsuccessequal "$HEADER Selected version '2.0' (sid) for foo -$DOWNLOAD2" aptget source -q --print-uris foo/sid +$DOWNLOAD2" apt source -q --print-uris foo/sid +testsuccessequal "$(getbuilddep 'foo' "Selected version '2.0' (sid) for foo")" apt build-dep foo/sid -s testsuccessequal "$HEADER Selected version '2.0' (sid) for foo -$DOWNLOAD2" aptget source -q --print-uris foo -t sid +$DOWNLOAD2" apt source -q --print-uris foo -t sid +testsuccessequal "$(getbuilddep 'foo' "Selected version '2.0' (sid) for foo")" apt build-dep foo -t sid -s testsuccessequal "$HEADER Selected version '2.0' (sid) for baz -$DOWNLOAD4" aptget source -q --print-uris baz -t sid +$DOWNLOAD4" apt source -q --print-uris baz -t sid +testsuccessequal "$(getbuilddep 'baz' "Selected version '2.0' (sid) for baz")" apt build-dep baz -t sid -s # select by version testsuccessequal "$HEADER -$DOWNLOAD1" aptget source -q --print-uris foo=1.0 +$DOWNLOAD1" apt source -q --print-uris foo=1.0 +testsuccessequal "$(getbuilddep 'foo')" apt build-dep foo=1.0 -s # select by release with no binary package (Bug#731102) but ensure to get # highest version @@ -113,27 +137,34 @@ DOWNLOAD01="Need to get 0 B/25 B of source archives. 'file://${APTARCHIVE}/foo_0.1.tar.gz' foo_0.1.tar.gz 14 SHA256:ec748ad88a71f98bfdc012e1a7632377d05fe3ebbf9c0922e0691fe4d79c0585" testsuccessequal "$HEADER Selected version '0.1' (wheezy) for foo -$DOWNLOAD01" aptget source -q --print-uris foo/wheezy +$DOWNLOAD01" apt source -q --print-uris foo/wheezy +testsuccessequal "$(getbuilddep 'foo' "Selected version '0.1' (wheezy) for foo")" apt build-dep foo/wheezy -s # unavailable one testfailureequal "$HEADER E: Can not find version '9.9-not-there' of package 'foo' -E: Unable to find a source package for foo" aptget source -q --print-uris foo=9.9-not-there +E: Unable to find a source package for foo" apt source -q --print-uris foo=9.9-not-there +testfailureequal "Reading package lists... +E: Can not find version '9.9-not-there' of package 'foo' +E: Unable to find a source package for foo=9.9-not-there" apt build-dep -s foo=9.9-not-there # version and release DOWNLOAD001="Need to get 0 B/29 B of source archives. 'file://${APTARCHIVE}/foo_0.0.1.dsc' foo_0.0.1.dsc 13 SHA256:649dfe03bbb70cebdfe7c6bf9036f9f2472510b8f52e823bdf5ade362ebaa76f 'file://${APTARCHIVE}/foo_0.0.1.tar.gz' foo_0.0.1.tar.gz 16 SHA256:ab7ba789d178362ecc808e49705e2338988a7f5b9410ec11a6c9555c017de907" testsuccessequal "$HEADER -$DOWNLOAD001" aptget source -q --print-uris -t unstable foo=0.0.1 +$DOWNLOAD001" apt source -q --print-uris -t unstable foo=0.0.1 +testsuccessequal "$(getbuilddep 'foo')" apt build-dep foo=0.0.1 -s testsuccessequal "$HEADER Need to get 0 B/25 B of source archives. -Fetch source foo" aptget source -q -s foo +Fetch source foo" apt source -q -s foo +testsuccessequal "$(getbuilddep 'foo')" apt build-dep foo -s testfailureequal 'Reading package lists... Building dependency tree... -E: Must specify at least one package to fetch source for' aptget source +E: Must specify at least one package to fetch source for' apt source +testfailureequal 'E: Must specify at least one package to check builddeps for' apt build-dep testsuccessequal "Reading package lists... Building dependency tree... @@ -143,17 +174,22 @@ Please use: git clone git://anonscm.debian.org/bar/bar.git -b debian/experimental to retrieve the latest (possibly unreleased) updates to the package. Need to get 0 B/25 B of source archives. -Fetch source bar" aptget source bar -s +Fetch source bar" apt source bar -s +testsuccessequal "$(getbuilddep 'bar')" apt build-dep bar -s testsuccessequal "$HEADER Need to get 0 B/25 B of source archives. -Fetch source bin" aptget source bin -s -q +Fetch source bin" apt source bin -s -q +testsuccessequal "$(getbuilddep 'bin')" apt build-dep bin -s testsuccessequal "$HEADER Selected version '3-2' (unstable) for bin Need to get 0 B/25 B of source archives. -Fetch source bin" aptget source bin/unstable -s -q +Fetch source bin" apt source bin/unstable -s -q +testsuccessequal "$(getbuilddep 'bin' "Selected version '3-2' (unstable) for bin")" apt build-dep bin/unstable -s testsuccessequal "$HEADER Picking 'bin-backport' as source package instead of 'bin' Selected version '2-2' (stable) for bin-backport Need to get 0 B/43 B of source archives. -Fetch source bin-backport" aptget source bin/stable -s -q +Fetch source bin-backport" apt source bin/stable -s -q +testsuccessequal "$(getbuilddep 'bin-backport' "Picking 'bin-backport' as source package instead of 'bin' +Selected version '2-2' (stable) for bin-backport")" apt build-dep bin/stable -s -- 2.45.2