diff options
| author | Martin Pitt <martin.pitt@ubuntu.com> | 2016-01-19 10:19:38 (GMT) |
|---|---|---|
| committer | Martin Pitt <martin.pitt@ubuntu.com> | 2016-01-19 10:19:38 (GMT) |
| commit | 7c1a251a413755736c59e429cca167fd59167e0b (patch) | |
| tree | 03c2d39aadf14c1f3c413732461a6d4fda283777 | |
| parent | b2148a7f8705005e8cca95d67b3a7156c0f3af59 (diff) | |
Drop apt-cache showsrc --only-source option
This is not yet understood by Ubuntu 12.04's apt.
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rwxr-xr-x | runner/adt-run | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 6e75b97..ce203b4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,6 +19,8 @@ autopkgtest (3.19.2) UNRELEASED; urgency=medium * adt-virt-lxc: Add timeouts to all LXC operations. * Fix chowning for "rw-build-tree" restriction: run it as root if available, and otherwise ignore it entirely. (LP: #1535234) + * Drop apt-cache showsrc --only-source option, as this is not yet understood + by Ubuntu 12.04's apt. -- Martin Pitt <mpitt@debian.org> Tue, 12 Jan 2016 12:08:47 +0100 diff --git a/runner/adt-run b/runner/adt-run index e7e78c3..9d45369 100755 --- a/runner/adt-run +++ b/runner/adt-run @@ -345,7 +345,7 @@ def build_source(kind, arg, built_binaries): # to the current apt pinning # apt-get source is terribly noisy; only show what gets downloaded create_command = ('maxver=''; ' - 'for pkg in $(apt-cache showsrc --only-source "%(src)s" | sed -n "/^Binary:/ { s/^Binary://; s/,//g; p }" | xargs -n1 | sort -u); do' + 'for pkg in $(apt-cache showsrc "%(src)s" | sed -n "/^Binary:/ { s/^Binary://; s/,//g; p }" | xargs -n1 | sort -u); do' ' pkg_candidate=$(apt-cache policy $pkg|sed -n "/Candidate:/ { s/^.* //; /none/d; p}");' ' [ -n "$pkg_candidate" ] || continue; ' ' show=$(apt-cache show $pkg=$pkg_candidate | grep "^Source:" || true);' |