diff options
author | Michael Vogt <mvo@debian.org> | 2014-02-23 00:45:56 +0100 |
---|---|---|
committer | Michael Vogt <mvo@debian.org> | 2014-02-23 00:45:56 +0100 |
commit | eccff323a093d91fff379e7c8460d7e5c8db8ad1 (patch) | |
tree | d539d21c6716af3122edabae91feadccfb3c12ad /test/integration/test-apt-cli-list | |
parent | 2c678b0a026ac9d44c8ade07aa8bf318faf5a9e2 (diff) | |
parent | b7ed961b8099c05f65e18d4c73ead50cc5c8bff1 (diff) |
Merge branch 'debian/sid' into ubuntu/master
Conflicts:
debian/changelog
Diffstat (limited to 'test/integration/test-apt-cli-list')
-rwxr-xr-x | test/integration/test-apt-cli-list | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/test/integration/test-apt-cli-list b/test/integration/test-apt-cli-list index 47507aeb8..47cfb624a 100755 --- a/test/integration/test-apt-cli-list +++ b/test/integration/test-apt-cli-list @@ -7,6 +7,12 @@ TESTDIR=$(readlink -f $(dirname $0)) setupenvironment configarchitecture "i386" +if [ ! -x ${BUILDDIRECTORY}/apt ]; then + msgmsg "No ${BUILDDIRECTORY}/apt" + msgskip + exit 0 +fi + insertpackage 'unstable' 'foo' 'all' '1.0' insertinstalledpackage 'bar' 'i386' '1.0' |