X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/e7ebb41440cbe298b07c7fb7c6b20a64a17200f0..757ec4e1ef633f9867928559df82adf3d0ac7b78:/test/integration/test-bug-604222-new-and-autoremove

diff --git a/test/integration/test-bug-604222-new-and-autoremove b/test/integration/test-bug-604222-new-and-autoremove
index e910c70cb..b6bb9ddea 100755
--- a/test/integration/test-bug-604222-new-and-autoremove
+++ b/test/integration/test-bug-604222-new-and-autoremove
@@ -1,8 +1,8 @@
 #!/bin/sh
 set -e
 
-TESTDIR=$(readlink -f $(dirname $0))
-. $TESTDIR/framework
+TESTDIR="$(readlink -f "$(dirname "$0")")"
+. "$TESTDIR/framework"
 setupenvironment
 configarchitecture "i386"
 setupaptarchive
@@ -11,12 +11,17 @@ touch rootdir/var/lib/apt/extended_states
 testsuccess aptmark markauto 'libvtk5.4'
 testmarkedauto 'libvtk5.4'
 
+AUTOREMOVE='apt autoremove'
+if [ -n "$SUDO_USER" ]; then
+	AUTOREMOVE="sudo $AUTOREMOVE"
+fi
+
 testsuccessequal "Reading package lists...
 Building dependency tree...
 Reading state information...
 The following package was automatically installed and is no longer required:
   libvtk5.4
-Use 'apt-get autoremove' to remove it.
+Use '$AUTOREMOVE' to remove it.
 The following NEW packages will be installed:
   libavcodec52
 0 upgraded, 1 newly installed, 0 to remove and 1 not upgraded.
@@ -27,7 +32,7 @@ testsuccessequal "Reading package lists...
 Building dependency tree...
 Reading state information...
 1 package was automatically installed and is no longer required.
-Use 'apt-get autoremove' to remove it.
+Use '$AUTOREMOVE' to remove it.
 The following NEW packages will be installed:
   libavcodec52
 0 upgraded, 1 newly installed, 0 to remove and 1 not upgraded.
@@ -39,7 +44,7 @@ Building dependency tree...
 Reading state information...
 The following package was automatically installed and is no longer required:
   libvtk5.4
-Use 'apt-get autoremove' to remove it.
+Use '$AUTOREMOVE' to remove it.
 The following additional packages will be installed:
   libavcodec52 libopenal-dev libvtk5.4
 The following NEW packages will be installed:
@@ -54,7 +59,7 @@ testequal "Reading package lists...
 Building dependency tree...
 Reading state information...
 1 package was automatically installed and is no longer required.
-Use 'apt-get autoremove' to remove it.
+Use '$AUTOREMOVE' to remove it.
 The following additional packages will be installed:
   libavcodec52 libopenal-dev libvtk5.4
 The following NEW packages will be installed:
@@ -71,13 +76,13 @@ rm rootdir/var/lib/apt/extended_states
 
 CONFLICTING='Reading package lists...
 Building dependency tree...
-  MarkInstall dummy-archive [ i386 ] < none -> 0.invalid.0 > ( admin ) FU=1
-    MarkInstall libavcodec52 [ i386 ] < none -> 4:0.5.2-6 > ( libs ) FU=0
-    MarkInstall libvtk5-dev [ i386 ] < none -> 5.4.2-8 > ( libdevel ) FU=0
-      MarkInstall libvtk5.4 [ i386 ] < none -> 5.4.2-8 > ( libs ) FU=0
-  MarkKeep libvtk5-dev [ i386 ] < none -> 5.4.2-8 > ( libdevel ) FU=0
-  MarkKeep libvtk5-dev [ i386 ] < none -> 5.4.2-8 > ( libdevel ) FU=0
-  MarkDelete libvtk5.4 [ i386 ] < none -> 5.4.2-8 > ( libs ) FU=0
+  MarkInstall dummy-archive:i386 < none -> 0.invalid.0 @un puN Ib > FU=1
+    MarkInstall libavcodec52:i386 < none -> 4:0.5.2-6 @un uN > FU=0
+    MarkInstall libvtk5-dev:i386 < none -> 5.4.2-8 @un uN Ib > FU=0
+      MarkInstall libvtk5.4:i386 < none -> 5.4.2-8 @un uN > FU=0
+  MarkKeep libvtk5-dev:i386 < none -> 5.4.2-8 @un uN > FU=0
+  MarkKeep libvtk5-dev:i386 < none -> 5.4.2-8 @un uN > FU=0
+  MarkDelete libvtk5.4:i386 < none -> 5.4.2-8 @un ugN > FU=0
 The following additional packages will be installed:
   libavcodec52 libopenal-dev
 The following NEW packages will be installed: