diff options
| author | David Kalnischkies <david@kalnischkies.de> | 2016-08-11 01:36:23 +0200 |
|---|---|---|
| committer | David Kalnischkies <david@kalnischkies.de> | 2016-08-11 01:36:23 +0200 |
| commit | 0a7370ca91289db3d23d72aeac397edfe3dfb75b (patch) | |
| tree | a268cee713cb295851634d3a4a91c7283b564952 /test/integration/test-ignore-provides-if-versioned-conflicts | |
| parent | 6b3ddbd059c403efeb40d81c29f2cae6e8f5b1bf (diff) | |
| parent | 28557f94578602f9ce0011501a2259bd98ab0688 (diff) | |
Merge branch 'feature/apt-dpkg-comm'
Diffstat (limited to 'test/integration/test-ignore-provides-if-versioned-conflicts')
| -rwxr-xr-x | test/integration/test-ignore-provides-if-versioned-conflicts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/integration/test-ignore-provides-if-versioned-conflicts b/test/integration/test-ignore-provides-if-versioned-conflicts index 839609431..3243cfb51 100755 --- a/test/integration/test-ignore-provides-if-versioned-conflicts +++ b/test/integration/test-ignore-provides-if-versioned-conflicts @@ -144,7 +144,7 @@ Inst foo-same [2.0] (4.0 unstable [i386]) [foo-same:i386 on foo-same:amd64] [foo 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]) -Conf foo-same:amd64 (4.0 unstable [amd64]) Conf foo-same (4.0 unstable [i386]) +Conf foo-same:amd64 (4.0 unstable [amd64]) 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 |