projects
/
apt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update manpage last-modified from git via pre-export hook
[apt.git]
/
test
/
integration
/
test-ignore-provides-if-versioned-breaks
diff --git
a/test/integration/test-ignore-provides-if-versioned-breaks
b/test/integration/test-ignore-provides-if-versioned-breaks
index 20424b94214e6bd276770219e20ef6f0fc78c447..a7d9d4054f48790673f404167044c57139b86ad8 100755
(executable)
--- a/
test/integration/test-ignore-provides-if-versioned-breaks
+++ b/
test/integration/test-ignore-provides-if-versioned-breaks
@@
-57,7
+57,7
@@
Conf foo-provider (1.0 unstable [i386])' aptget install foo-provider foo-breaker
testsuccessequal 'Reading package lists...
Building dependency tree...
testsuccessequal 'Reading package lists...
Building dependency tree...
-The following
extra
packages will be installed:
+The following
additional
packages will be installed:
foo
The following NEW packages will be installed:
foo-breaker-3 foo-provider
foo
The following NEW packages will be installed:
foo-breaker-3 foo-provider
@@
-95,7
+95,7
@@
Conf foo-foreign-provider (1.0 unstable [i386])' aptget install foo-foreign-prov
testsuccessequal 'Reading package lists...
Building dependency tree...
testsuccessequal 'Reading package lists...
Building dependency tree...
-The following
extra
packages will be installed:
+The following
additional
packages will be installed:
foo-foreign:amd64
The following NEW packages will be installed:
foo-foreign-breaker-3 foo-foreign-provider
foo-foreign:amd64
The following NEW packages will be installed:
foo-foreign-breaker-3 foo-foreign-provider
@@
-133,18
+133,18
@@
Conf foo-same-provider (1.0 unstable [i386])' aptget install foo-same-provider f
testsuccessequal 'Reading package lists...
Building dependency tree...
testsuccessequal 'Reading package lists...
Building dependency tree...
-The following
extra
packages will be installed:
- foo-same
:amd64 foo-same
+The following
additional
packages will be installed:
+ foo-same
foo-same:amd64
The following NEW packages will be installed:
foo-same-breaker-3 foo-same-provider
The following packages will be upgraded:
The following NEW packages will be installed:
foo-same-breaker-3 foo-same-provider
The following packages will be upgraded:
- foo-same
:amd64 foo-same
+ foo-same
foo-same:amd64
2 upgraded, 2 newly installed, 0 to remove and 2 not upgraded.
2 upgraded, 2 newly installed, 0 to remove and 2 not upgraded.
-Inst foo-same
:amd64 [2.0] (4.0 unstable [amd64]) [foo-same:amd64 on foo-same:i386] [foo-same:i386 on foo-same:amd64] [foo-same:i386
]
-Inst foo-same
[2.0] (4.0 unstable [i386
])
+Inst foo-same
[2.0] (4.0 unstable [i386]) [foo-same:i386 on foo-same:amd64] [foo-same:amd64 on foo-same:i386] [foo-same:amd64
]
+Inst foo-same
:amd64 [2.0] (4.0 unstable [amd64
])
Inst foo-same-breaker-3 (1.0 unstable [i386])
Inst foo-same-provider (1.0 unstable [i386])
Inst foo-same-breaker-3 (1.0 unstable [i386])
Inst foo-same-provider (1.0 unstable [i386])
-Conf foo-same (4.0 unstable [i386])
Conf foo-same:amd64 (4.0 unstable [amd64])
Conf foo-same:amd64 (4.0 unstable [amd64])
+Conf foo-same (4.0 unstable [i386])
Conf foo-same-breaker-3 (1.0 unstable [i386])
Conf foo-same-provider (1.0 unstable [i386])' aptget install foo-same-provider foo-same-breaker-3 -s
Conf foo-same-breaker-3 (1.0 unstable [i386])
Conf foo-same-provider (1.0 unstable [i386])' aptget install foo-same-provider foo-same-breaker-3 -s