26 lines
978 B
Diff
26 lines
978 B
Diff
|
From 81ea154b8af63614ed1eb63bd86de8da9d02a1df Mon Sep 17 00:00:00 2001
|
||
|
|
From: Michael Schroeder <mls@suse.de>
|
||
|
|
Date: Fri, 30 Nov 2018 14:35:16 +0100
|
||
|
|
Subject: [PATCH 3/4] Note to self: do not commit unfinished test cases...
|
||
|
|
|
||
|
|
(cherry picked from commit 1052e5cd4860d4d88227ae8d8363f0de933894df)
|
||
|
|
---
|
||
|
|
test/testcases/allowuninstall/conflict.t | 4 +++-
|
||
|
|
1 file changed, 3 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/test/testcases/allowuninstall/conflict.t b/test/testcases/allowuninstall/conflict.t
|
||
|
|
index 8dc8024b..a66d3227 100644
|
||
|
|
--- a/test/testcases/allowuninstall/conflict.t
|
||
|
|
+++ b/test/testcases/allowuninstall/conflict.t
|
||
|
|
@@ -9,4 +9,6 @@ solverflags allowuninstall
|
||
|
|
disable pkg a-1-1.noarch@system
|
||
|
|
job install name b
|
||
|
|
result transaction,problems <inline>
|
||
|
|
-
|
||
|
|
+#>problem a658cbaf info package a-1-1.noarch conflicts with b provided by b-1-1.noarch
|
||
|
|
+#>problem a658cbaf solution 567aa15d erase a-1-1.noarch@system
|
||
|
|
+#>problem a658cbaf solution e98e1a37 deljob install name b
|
||
|
|
--
|
||
|
|
2.19.2
|
||
|
|
|