Merge remote-tracking branch 'upstream/debian/experimental' into feature/srv-records

1 files changed, 81 insertions, 23 deletions

diff --git a/test/integration/test-apt-cache b/test/integration/test-apt-cache
index f3db8024f..97d180a74 100755
--- a/test/integration/test-apt-cache
+++ b/test/integration/test-apt-cache
@@ -16,6 +16,9 @@ Recommends: cool (>= 2) | cooler (<< 5)' "$DESCR"
 insertpackage 'unstable' 'bar' 'all' '1' 'Depends: bar
 Breaks: foo (<< 1)
 Replaces: foo (<< 1)' "$DESCR"
+insertpackage 'unstable' 'specific' 'all' '1' 'Depends: bar:i386, specific:amd64
+Breaks: foo:amd64 (<< 1)
+Replaces: foo:i386 (<< 1)' "$DESCR"
 
 setupaptarchive
 
@@ -44,81 +47,136 @@ testsuccess test -s dump.output
 
 testsuccessequal 'dpkg
 bar
+specific
 fancy
 foo' aptcache pkgnames
 testsuccessequal 'bar' aptcache pkgnames bar
 testsuccessequal 'fancy
 foo' aptcache pkgnames f
 
-testsuccessequal "       foo |          1 | file:$(readlink -f .)/aptarchive/ unstable/main amd64 Packages" aptcache madison foo
+testsuccessequal "       foo |          1 | file:$(readlink -f .)/aptarchive unstable/main amd64 Packages
+       foo |          1 | file:$(readlink -f .)/aptarchive unstable/main i386 Packages" aptcache madison foo
 
 ### depends
 
 testsuccessequal 'foo
   Depends: bar
- |Recommends: <cool>
-  Recommends: <cooler>
   Conflicts: <foobar>
-  Conflicts: <foobar:i386>' aptcache depends foo
+ |Recommends: <cool>
+  Recommends: <cooler>' aptcache depends foo
 testsuccessequal 'foo
   Depends: bar
-  Recommends: <cool>
   Conflicts: <foobar>
-  Conflicts: <foobar:i386>' aptcache depends foo -o APT::Cache::ShowOnlyFirstOr=1
+ |Recommends: <cool>
+  Recommends: <cooler>' aptcache depends foo --implicit
 testsuccessequal 'foo
   Depends: bar
- |Recommends: <cool> (>= 2)
-  Recommends: <cooler> (<< 5)
   Conflicts: <foobar>
-  Conflicts: <foobar:i386>' aptcache depends foo -o APT::Cache::ShowVersion=1
+  Recommends: <cool>' aptcache depends foo -o APT::Cache::ShowOnlyFirstOr=1
 testsuccessequal 'foo
   Depends: bar
   Conflicts: <foobar>
-  Conflicts: <foobar:i386>' aptcache depends foo --no-recommends
+  Recommends: <cool>' aptcache depends foo -o APT::Cache::ShowOnlyFirstOr=1 --implicit
 testsuccessequal 'foo
-  Depends: bar' aptcache depends foo --important
+  Depends: bar
+  Conflicts: <foobar>
+ |Recommends: <cool> (>= 2)
+  Recommends: <cooler> (<< 5)' aptcache depends foo -o APT::Cache::ShowVersion=1
 testsuccessequal 'foo
+  Depends: bar
   Conflicts: <foobar>
-  Conflicts: <foobar:i386>' aptcache depends foo --important --no-depends --conflicts
+ |Recommends: <cool> (>= 2)
+  Recommends: <cooler> (<< 5)' aptcache depends foo -o APT::Cache::ShowVersion=1 --implicit
 testsuccessequal 'foo
   Depends: bar
+  Conflicts: <foobar>' aptcache depends foo --no-recommends
+testsuccessequal 'foo
+  Depends: bar
+  Conflicts: <foobar>' aptcache depends foo --no-recommends --implicit
+testsuccessequal 'foo
+  Depends: bar' aptcache depends foo --important --implicit
+testsuccessequal 'foo
+  Conflicts: <foobar>' aptcache depends foo --important --no-depends --conflicts
+testsuccessequal 'foo
+  Conflicts: <foobar>' aptcache depends foo --important --no-depends --conflicts --implicit
+testsuccessequal 'foo
+  Depends: bar
+  Conflicts: <foobar>
  |Recommends: <cool>
   Recommends: <cooler>
+bar
+  Depends: bar
+  Breaks: foo
+  Replaces: foo
+<foobar>
+<cool>
+<cooler>' aptcache depends foo --recurse
+testsuccessequal 'foo
+  Depends: bar
   Conflicts: <foobar>
-  Conflicts: <foobar:i386>
+ |Recommends: <cool>
+  Recommends: <cooler>
 bar
   Depends: bar
   Breaks: foo
-  Breaks: <foo:i386>
   Replaces: foo
+  Breaks: <foo:i386>
   Replaces: <foo:i386>
+<foobar>
 <cool>
 <cooler>
-<foobar>
-<foobar:i386>
-<foo:i386>' aptcache depends foo --recurse
+<foo:i386>' aptcache depends foo --recurse --implicit
+testsuccessequal 'foo
+  Depends: bar
+bar
+  Depends: bar
+  Replaces: foo' aptcache depends foo --recurse --important --replaces
 testsuccessequal 'foo
   Depends: bar
 bar
   Depends: bar
   Replaces: foo
   Replaces: <foo:i386>
-<foo:i386>' aptcache depends foo --recurse --important --replaces
+<foo:i386>' aptcache depends foo --recurse --important --replaces --implicit
+testsuccessequal 'bar
+  Depends: bar
+  Breaks: foo
+  Replaces: foo' aptcache depends bar
+testsuccessequal 'bar
+  Depends: bar
+  Breaks: foo
+  Replaces: foo
+  Breaks: <foo:i386>
+  Replaces: <foo:i386>' aptcache depends bar --implicit
+testsuccessequal 'specific
+  Depends: <bar:i386>
+  Depends: specific:amd64
+  Breaks: foo:amd64
+  Replaces: <foo:i386>' aptcache depends specific
+testsuccessequal 'specific
+  Depends: <bar:i386>
+  Depends: specific:amd64
+  Breaks: foo:amd64
+  Replaces: <foo:i386>' aptcache depends specific --implicit
 
 ## rdpends
 
 testsuccessequal 'foo
 Reverse Depends:
   bar
+  specific
   bar' aptcache rdepends foo
 testsuccessequal 'foo
 Reverse Depends:
-  Replaces: bar
-  Breaks: bar' aptcache rdepends foo -o APT::Cache::ShowDependencyType=1
+  Breaks: bar
+  Breaks: specific
+  Replaces: bar' aptcache rdepends foo -o APT::Cache::ShowDependencyType=1
 testsuccessequal 'foo
 Reverse Depends:
-  Replaces: bar (<< 1)
-  Breaks: bar (<< 1)' aptcache rdepends foo -o APT::Cache::ShowDependencyType=1 -o APT::Cache::ShowVersion=1
+  Breaks: bar (<< 1)
+  Breaks: specific (<< 1)
+  Replaces: bar (<< 1)' aptcache rdepends foo -o APT::Cache::ShowDependencyType=1 -o APT::Cache::ShowVersion=1
 testsuccessequal 'foo
 Reverse Depends:
-  Breaks: bar (<< 1)' aptcache rdepends foo -o APT::Cache::ShowDependencyType=1 -o APT::Cache::ShowVersion=1 --important --breaks
+  Breaks: bar (<< 1)
+  Breaks: specific (<< 1)' aptcache rdepends foo -o APT::Cache::ShowDependencyType=1 -o APT::Cache::ShowVersion=1 --important --breaks