diff -Nru autopkgtest-4.3ubuntu1/debian/changelog autopkgtest-4.3ubuntu2/debian/changelog --- autopkgtest-4.3ubuntu1/debian/changelog 2017-02-17 05:07:09.000000000 +0000 +++ autopkgtest-4.3ubuntu2/debian/changelog 2017-05-12 21:28:59.000000000 +0000 @@ -1,3 +1,11 @@ +autopkgtest (4.3ubuntu2) artful; urgency=medium + + * Use ".../src" as temporary package build directory instead of + -. This makes build path predictably shorter. + (LP: #1680577) + + -- Balint Reczey Fri, 12 May 2017 21:28:59 +0000 + autopkgtest (4.3ubuntu1) zesty; urgency=medium * Update debian/tests/lxd to support LXD storage API. diff -Nru autopkgtest-4.3ubuntu1/runner/adt-run autopkgtest-4.3ubuntu2/runner/adt-run --- autopkgtest-4.3ubuntu1/runner/adt-run 2017-01-11 11:34:09.000000000 +0000 +++ autopkgtest-4.3ubuntu2/runner/adt-run 2017-05-12 21:28:47.000000000 +0000 @@ -321,7 +321,7 @@ p = adt_testbed.Path(testbed, part, os.path.join(testbed.scratch, os.path.basename(part))) p.copydown() - create_command = 'dpkg-source -x "%s"' % dsc_tb + create_command = 'dpkg-source -x "%s" src' % dsc_tb elif kind == 'unbuilt-tree': dsc = os.path.join(tmp, 'fake.dsc') @@ -385,10 +385,10 @@ ' ver=${srcversion:-$pkg_candidate};' ' dpkg --compare-versions "$ver" lt "$maxver" || maxver="$ver";' 'done;' - '[ -z "$maxver" ] || maxver="=$maxver";' - 'OUT=$(apt-get source -q --only-source %(src)s$maxver 2>&1) || RC=$?;' + '[ -z "$maxver" ] || maxver="$maxver";' + 'OUT=$(apt-get source -d -q --only-source %(src)s=$maxver 2>&1) || RC=$?;' 'if [ -n "$RC" ]; then if echo "$OUT" | grep -q "Unable to find a source package"; then exit 1; else exit $RC; fi; fi;' - 'echo "$OUT" | grep ^Get: || true' % {'src': arg}) + 'echo "$OUT" | grep ^Get: ; dpkg-source -x %(src)s_$maxver.dsc src' % {'src': arg}) elif kind == 'git-source': url, _, branch = arg.partition('#') create_command = "git clone '%s' || { sleep 15; git clone '%s'; }" % (url, url) diff -Nru autopkgtest-4.3ubuntu1/runner/autopkgtest autopkgtest-4.3ubuntu2/runner/autopkgtest --- autopkgtest-4.3ubuntu1/runner/autopkgtest 2017-01-11 11:34:09.000000000 +0000 +++ autopkgtest-4.3ubuntu2/runner/autopkgtest 2017-05-12 21:28:47.000000000 +0000 @@ -321,7 +321,7 @@ p = adt_testbed.Path(testbed, part, os.path.join(testbed.scratch, os.path.basename(part))) p.copydown() - create_command = 'dpkg-source -x "%s"' % dsc_tb + create_command = 'dpkg-source -x "%s" src' % dsc_tb elif kind == 'unbuilt-tree': dsc = os.path.join(tmp, 'fake.dsc') @@ -385,10 +385,10 @@ ' ver=${srcversion:-$pkg_candidate};' ' dpkg --compare-versions "$ver" lt "$maxver" || maxver="$ver";' 'done;' - '[ -z "$maxver" ] || maxver="=$maxver";' - 'OUT=$(apt-get source -q --only-source %(src)s$maxver 2>&1) || RC=$?;' + '[ -z "$maxver" ] || maxver="$maxver";' + 'OUT=$(apt-get source -d -q --only-source %(src)s=$maxver 2>&1) || RC=$?;' 'if [ -n "$RC" ]; then if echo "$OUT" | grep -q "Unable to find a source package"; then exit 1; else exit $RC; fi; fi;' - 'echo "$OUT" | grep ^Get: || true' % {'src': arg}) + 'echo "$OUT" | grep ^Get: ; dpkg-source -x %(src)s_$maxver.dsc src' % {'src': arg}) elif kind == 'git-source': url, _, branch = arg.partition('#') create_command = "git clone '%s' || { sleep 15; git clone '%s'; }" % (url, url)