merge patch from Daniel Hartwig to Show a error message if {,dist-}upgrade is used...

[apt.git] / test / integration / test-bug-612557-garbage-upgrade

diff --git a/test/integration/test-bug-612557-garbage-upgrade b/test/integration/test-bug-612557-garbage-upgrade
index e2ffe615f21af45094a08ae9b06162a095a0b11e..8efd1687acc311ec336bec7530f1948f4bffc4f8 100755 (executable)
--- a/test/integration/test-bug-612557-garbage-upgrade
+++ b/test/integration/test-bug-612557-garbage-upgrade
@@ -1,7 +1,7 @@
 #!/bin/sh
 set -e
 
 #!/bin/sh
 set -e
 

-local TESTDIR=$(readlink -f $(dirname $0))
+TESTDIR=$(readlink -f $(dirname $0))

 . $TESTDIR/framework
 setupenvironment
 configarchitecture "i386"
 . $TESTDIR/framework
 setupenvironment
 configarchitecture "i386"


@@ -13,9 +13,9 @@ insertpackage 'unstable' 'libreoffice-common' 'all' '1:3.3.0-2' 'Conflicts: open
 setupaptarchive
 
 touch rootdir/var/lib/apt/extended_states
 setupaptarchive
 
 touch rootdir/var/lib/apt/extended_states

-aptmark markauto python-uno ure uno-libs3 openoffice.org-common openoffice.org-style-galaxy
+aptmark markauto python-uno openoffice.org-common

 #aptmark unmarkauto openoffice.org-emailmerge
 #aptmark unmarkauto openoffice.org-emailmerge

-testmarkedauto python-uno ure uno-libs3 openoffice.org-common openoffice.org-style-galaxy
+testmarkedauto python-uno openoffice.org-common

 
 testequal 'Reading package lists...
 Building dependency tree...
 
 testequal 'Reading package lists...
 Building dependency tree...


@@ -33,7 +33,7 @@ After this operation, 53.2 MB disk space will be freed.
 E: Trivial Only specified but this is not a trivial operation.' aptget --trivial-only install python-uno
 
 aptmark markauto openoffice.org-emailmerge
 E: Trivial Only specified but this is not a trivial operation.' aptget --trivial-only install python-uno
 
 aptmark markauto openoffice.org-emailmerge

-testmarkedauto python-uno ure uno-libs3 openoffice.org-common openoffice.org-style-galaxy openoffice.org-emailmerge
+testmarkedauto python-uno openoffice.org-common openoffice.org-emailmerge

 
 testequal 'Reading package lists...
 Building dependency tree...
 
 testequal 'Reading package lists...
 Building dependency tree...