summaryrefslogtreecommitdiffstats
path: root/pactest
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2008-02-11 16:51:34 +0100
committerDan McGee <dan@archlinux.org>2008-02-12 03:40:43 +0100
commitfbf3beb8d281e85c69f1683df2d9c7b2fb5c1ab7 (patch)
treef3d7d9d230bc90cae955cc7aff72981f824de34f /pactest
parent7586072beb8fde6631fe43a2eee5ca76255055d0 (diff)
downloadpacman-fbf3beb8d281e85c69f1683df2d9c7b2fb5c1ab7.tar.gz
pacman-fbf3beb8d281e85c69f1683df2d9c7b2fb5c1ab7.tar.xz
ensure chk_fileconflicts reads entire file list
If the end of the pB list was reached before the end of pA, we failed to read any remaining files from the pA list. Add an additional loop to ensure all entries of pA are added to the return list regardless of whether we have reached the end of pB. This new loop also eliminates the now-unnecessary check for a null pB, as we need to ensure we are excluding directories in the resulting output anyway. Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'pactest')
-rw-r--r--pactest/tests/upgrade011.py16
1 files changed, 16 insertions, 0 deletions
diff --git a/pactest/tests/upgrade011.py b/pactest/tests/upgrade011.py
new file mode 100644
index 00000000..d8ed8734
--- /dev/null
+++ b/pactest/tests/upgrade011.py
@@ -0,0 +1,16 @@
+self.description = "Upgrade a package with a filesystem conflict"
+
+p = pmpkg("dummy", "2.0-1")
+p.files = ["bin/dummy", "usr/share/file"]
+self.addpkg(p)
+
+lp = pmpkg("dummy", "1.0-1")
+lp.files = ["bin/dummy"]
+self.addpkg2db("local", lp)
+
+self.filesystem = ["usr/share/file"]
+
+self.args = "-U %s" % p.filename()
+
+self.addrule("PACMAN_RETCODE=1")
+self.addrule("PKG_VERSION=dummy|1.0-1")