summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorTimo Teräs <timo.teras@iki.fi>2013-06-20 13:12:44 +0300
committerTimo Teräs <timo.teras@iki.fi>2013-06-20 13:12:44 +0300
commit7e18398781b056f858ef60200e24b0f8ab394cfe (patch)
tree4323eed281a457910a1fffa63d5fb9a29d1f6735 /test
parent17145f82aeba9a9fdfdf03cb4f74cb41cf3ab913 (diff)
downloadapk-tools-7e18398781b056f858ef60200e24b0f8ab394cfe.tar.bz2
apk-tools-7e18398781b056f858ef60200e24b0f8ab394cfe.tar.xz
commit, db: make file conflicts and script errors non-fatal
fixes #1482
Diffstat (limited to 'test')
-rw-r--r--test/fix4.test2
-rw-r--r--test/fix5.test2
-rw-r--r--test/fix6.test4
3 files changed, 4 insertions, 4 deletions
diff --git a/test/fix4.test b/test/fix4.test
index 431266b..8005d5f 100644
--- a/test/fix4.test
+++ b/test/fix4.test
@@ -4,5 +4,5 @@
--test-world a
fix b
@EXPECT
-(1/1) Re-installing b (1)
+(1/1) Reinstalling b (1)
OK: 0 MiB in 2 packages
diff --git a/test/fix5.test b/test/fix5.test
index 33029fc..3c00d94 100644
--- a/test/fix5.test
+++ b/test/fix5.test
@@ -4,5 +4,5 @@
--test-world a
fix a
@EXPECT
-(1/1) Re-installing a (1)
+(1/1) Reinstalling a (1)
OK: 0 MiB in 2 packages
diff --git a/test/fix6.test b/test/fix6.test
index c6dc6bd..ff87a10 100644
--- a/test/fix6.test
+++ b/test/fix6.test
@@ -5,6 +5,6 @@
--depends
fix a
@EXPECT
-(1/2) Re-installing b (1)
-(2/2) Re-installing a (1)
+(1/2) Reinstalling b (1)
+(2/2) Reinstalling a (1)
OK: 0 MiB in 2 packages