diff options
| author | David Kalnischkies <david@kalnischkies.de> | 2016-01-20 00:09:36 +0100 |
|---|---|---|
| committer | David Kalnischkies <david@kalnischkies.de> | 2016-01-25 18:15:44 +0100 |
| commit | 530302ef25d14bd7577f18cf98c2fa868c3c1dd3 (patch) | |
| tree | 7012f15154f9b401df001241830653790a819282 /test | |
| parent | 37ca1f876972e35b979ebd5ee78bb0e2623f011f (diff) | |
always create pkg at the time pkg:arch is created
To resolve dependencies like "pkg:arch" we create a package with the
name "pkg:arch" and the architecture "any". We create these packages
only if a dependency needs it as these kind of dependencies aren't that
common. This commit ensured that in the even this architecture specific
dependency is the only relation this package has we still create the
underlying package to have them available in provides resolution.
Diffstat (limited to 'test')
| -rwxr-xr-x | test/integration/test-apt-cache | 13 | ||||
| -rwxr-xr-x | test/integration/test-specific-architecture-dependencies | 4 |
2 files changed, 12 insertions, 5 deletions
diff --git a/test/integration/test-apt-cache b/test/integration/test-apt-cache index 48d623596..bff1667e8 100755 --- a/test/integration/test-apt-cache +++ b/test/integration/test-apt-cache @@ -120,9 +120,12 @@ bar Depends: bar Breaks: foo Replaces: foo + Breaks: <foo:i386> + Replaces: <foo:i386> <foobar> <cool> -<cooler>' aptcache depends foo --recurse --implicit +<cooler> +<foo:i386>' aptcache depends foo --recurse --implicit testsuccessequal 'foo Depends: bar bar @@ -132,7 +135,9 @@ testsuccessequal 'foo Depends: bar bar Depends: bar - Replaces: foo' aptcache depends foo --recurse --important --replaces --implicit + Replaces: foo + Replaces: <foo:i386> +<foo:i386>' aptcache depends foo --recurse --important --replaces --implicit testsuccessequal 'bar Depends: bar Breaks: foo @@ -140,7 +145,9 @@ testsuccessequal 'bar testsuccessequal 'bar Depends: bar Breaks: foo - Replaces: foo' aptcache depends bar --implicit + Replaces: foo + Breaks: <foo:i386> + Replaces: <foo:i386>' aptcache depends bar --implicit testsuccessequal 'specific Depends: <bar:i386> diff --git a/test/integration/test-specific-architecture-dependencies b/test/integration/test-specific-architecture-dependencies index 746ecb351..959555619 100755 --- a/test/integration/test-specific-architecture-dependencies +++ b/test/integration/test-specific-architecture-dependencies @@ -108,12 +108,12 @@ Conf depender-x64:i386 (1 unstable [i386])' aptget install depender-x64:i386 -s testequal 'Reading package lists... Building dependency tree... The following packages will be REMOVED: - libold libold:i386 + libold:i386 libold The following NEW packages will be installed: breaker 0 upgraded, 1 newly installed, 2 to remove and 0 not upgraded. -Remv libold [1] Remv libold:i386 [1] +Remv libold [1] Inst breaker (1 unstable [all]) Conf breaker (1 unstable [all])' aptget install breaker -s |