summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cmdline/apt.cc3
-rwxr-xr-xtest/integration/test-apt-cli-search3
-rwxr-xr-xtest/integration/test-apt-cli-show29
3 files changed, 31 insertions, 4 deletions
diff --git a/cmdline/apt.cc b/cmdline/apt.cc
index 61d5d938a..07ade6b7c 100644
--- a/cmdline/apt.cc
+++ b/cmdline/apt.cc
@@ -103,10 +103,11 @@ int main(int argc, const char *argv[]) /*{{{*/
CommandLine::Dispatch Cmds[] = {{"list",&List},
{"search", &FullTextSearch},
{"show", &APT::Cmd::ShowPackage},
- // needs root
+ // package stuff
{"install",&DoInstall},
{"remove", &DoInstall},
{"purge", &DoInstall},
+ // system wide stuff
{"update",&DoUpdate},
{"upgrade",&DoAptUpgrade},
// misc
diff --git a/test/integration/test-apt-cli-search b/test/integration/test-apt-cli-search
index aa6018bca..979aff880 100755
--- a/test/integration/test-apt-cli-search
+++ b/test/integration/test-apt-cli-search
@@ -40,6 +40,3 @@ testequal "bar/testing 2.0 i386
foo/unstable 1.0 all
$DESCR
" apt search -qq aabbcc
-
-
-
diff --git a/test/integration/test-apt-cli-show b/test/integration/test-apt-cli-show
new file mode 100755
index 000000000..0ab3d2e56
--- /dev/null
+++ b/test/integration/test-apt-cli-show
@@ -0,0 +1,29 @@
+#!/bin/sh
+set -e
+
+TESTDIR=$(readlink -f $(dirname $0))
+. $TESTDIR/framework
+
+setupenvironment
+configarchitecture "i386"
+
+DESCR='Some description
+ That has multiple lines'
+insertpackage 'unstable' 'foo' 'all' '1.0' '' '' "$DESCR"
+
+setupaptarchive
+
+APTARCHIVE=$(readlink -f ./aptarchive)
+
+# note that we do not display Description-md5 with the "apt" cmd
+testequal "Package: foo
+Priority: optional
+Section: other
+Installed-Size: 42
+Maintainer: Joe Sixpack <joe@example.org>
+Architecture: all
+Version: 1.0
+Filename: pool/main/foo/foo_1.0_all.deb
+Description: Some description
+ That has multiple lines
+" apt show foo