Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/pactest/tests/fileconflict002.py
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2008-03-08 14:04:06 -0600
committerDan McGee <dan@archlinux.org>2008-03-08 14:13:22 -0600
commit266f06866bd56b86ca8525d2e07d48d08fedaa8f (patch)
tree18221ade65ea3d57bf6fb01f109203fcaafe722b /pactest/tests/fileconflict002.py
parent49197b7492d61bf1fc6bef59a708f4f586f32edb (diff)
Move -A pactests that are relevant to -U, clean the rest out
This is in anticipation of removing the -A/--add option from the pacman frontend. I've went through each of the pacman pactests that used the -A operation and decided whether they were worth keeping, whether there was already an upgrade test doing the same thing, or whether it should be moved over. The GIT rename log should make several of the moves obvious, but for those that were deleted: add001: handled by upgrade004 add002: worthless add004: worthless add010: handled by upgrade011 add050: handled by upgrade010 Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'pactest/tests/fileconflict002.py')
-rw-r--r--pactest/tests/fileconflict002.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/pactest/tests/fileconflict002.py b/pactest/tests/fileconflict002.py
index da04e332..c54f6daf 100644
--- a/pactest/tests/fileconflict002.py
+++ b/pactest/tests/fileconflict002.py
@@ -9,7 +9,7 @@ p2 = pmpkg("pkg2")
p2.files = ["dir/symdir/file"]
self.addpkg(p2)
-self.args = "-A %s" % " ".join([p.filename() for p in p1, p2])
+self.args = "-U %s" % " ".join([p.filename() for p in p1, p2])
self.addrule("PACMAN_RETCODE=1")
self.addrule("!PKG_EXIST=pkg1")