From fbf3beb8d281e85c69f1683df2d9c7b2fb5c1ab7 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Mon, 11 Feb 2008 09:51:34 -0600 Subject: 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 --- pactest/tests/upgrade011.py | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 pactest/tests/upgrade011.py (limited to 'pactest') 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") -- cgit v1.2.3-70-g09d2