From 3000b6b473422dca3670c922c24d0e15e963281a Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Mon, 16 May 2011 11:08:32 -0500 Subject: pactest: treat symlinks with more respect Don't call os.stat() when we should be using os.lstat(); this allows us to actually test dead symlinks that don't have a corresponding file. Add a new LINK_EXIST rule that complements FILE_EXIST for a similar purpose. Signed-off-by: Dan McGee --- test/pacman/pmpkg.py | 2 +- test/pacman/pmrule.py | 8 ++++++++ test/pacman/util.py | 6 ++---- 3 files changed, 11 insertions(+), 5 deletions(-) (limited to 'test') diff --git a/test/pacman/pmpkg.py b/test/pacman/pmpkg.py index 73156ab2..be177f35 100755 --- a/test/pacman/pmpkg.py +++ b/test/pacman/pmpkg.py @@ -102,7 +102,7 @@ class pmpkg(object): # Generate package file system for f in self.files: util.mkfile(f, f) - self.size += os.stat(util.getfilename(f))[stat.ST_SIZE] + self.size += os.lstat(util.getfilename(f))[stat.ST_SIZE] # .PKGINFO data = ["pkgname = %s" % self.name] diff --git a/test/pacman/pmrule.py b/test/pacman/pmrule.py index c68d085e..0f6ae602 100755 --- a/test/pacman/pmrule.py +++ b/test/pacman/pmrule.py @@ -146,6 +146,14 @@ class pmrule(object): else: print "FILE rule '%s' not found" % case success = -1 + elif kind == "LINK": + filename = os.path.join(test.root, key) + if case == "EXIST": + if not os.path.islink(filename): + success = 0 + else: + print "LINK rule '%s' not found" % case + success = -1 elif kind == "CACHE": cachedir = os.path.join(test.root, util.PM_CACHEDIR) if case == "EXISTS": diff --git a/test/pacman/util.py b/test/pacman/util.py index b771a345..47fde310 100755 --- a/test/pacman/util.py +++ b/test/pacman/util.py @@ -149,7 +149,6 @@ def getmd5sum(filename): """ """ if not os.path.isfile(filename): - print "file %s does not exist!" % filename return "" fd = open(filename, "rb") checksum = hashlib.md5() @@ -177,9 +176,8 @@ def getmtime(filename): """ """ if not os.path.exists(filename): - print "path %s does not exist!" % filename - return 0, 0, 0 - st = os.stat(filename) + return None, None, None + st = os.lstat(filename) return st[stat.ST_ATIME], st[stat.ST_MTIME], st[stat.ST_CTIME] # -- cgit v1.2.3-70-g09d2 From 93f02f5793ad7907aa0bc7c4a9fe64f0c7ce86f6 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Mon, 16 May 2011 11:32:33 -0500 Subject: Add test for FS#24230, dead backup symlink removal This currently causes a segfault, which is bad news. Signed-off-by: Dan McGee --- test/pacman/tests/symlink002.py | 45 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 test/pacman/tests/symlink002.py (limited to 'test') diff --git a/test/pacman/tests/symlink002.py b/test/pacman/tests/symlink002.py new file mode 100644 index 00000000..7dcafb0d --- /dev/null +++ b/test/pacman/tests/symlink002.py @@ -0,0 +1,45 @@ +self.description = "Dead backed-up symlink when removing package (FS#24230)" + +# symlink file is changed +lp = pmpkg("dummy") +lp.files = ["etc/brokenlink -> nonexistent", + "etc/exists"] +lp.backup = ["etc/brokenlink*"] +self.addpkg2db("local", lp) + +# symlink file is not changed +lp2 = pmpkg("dummy2") +lp2.files = ["etc/brokenlink2 -> nonexistent2", + "etc/exists2"] +lp2.backup = ["etc/brokenlink2"] +self.addpkg2db("local", lp2) + +# package is left alone, not uninstalled +lp3 = pmpkg("dummy3") +lp3.files = ["etc/brokenlink3 -> nonexistent3", + "etc/exists3"] +self.addpkg2db("local", lp3) + +self.args = "-R %s %s" % (lp.name, lp2.name) +#self.args = "-R" + +self.addrule("PACMAN_RETCODE=0") + +self.addrule("!PKG_EXIST=dummy") +self.addrule("!LINK_EXIST=etc/brokenlink") +self.addrule("!FILE_EXIST=etc/nonexistent") +self.addrule("!FILE_EXIST=etc/exists") + +self.addrule("!PKG_EXIST=dummy2") +self.addrule("!LINK_EXIST=etc/brokenlink2") +self.addrule("!FILE_EXIST=etc/nonexistent2") +self.addrule("!FILE_EXIST=etc/exists2") + +self.addrule("PKG_EXIST=dummy3") +self.addrule("LINK_EXIST=etc/brokenlink3") +self.addrule("!FILE_EXIST=etc/nonexistent") +self.addrule("FILE_EXIST=etc/exists3") +self.addrule("FILE_TYPE=etc/brokenlink3|link") +self.addrule("FILE_TYPE=etc/exists3|file") + +self.expectfailure = True -- cgit v1.2.3-70-g09d2 From aec60e37822509a1ca7fc53244878d3f1505d964 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Mon, 16 May 2011 11:50:13 -0500 Subject: Fix segfault when uninstalling broken backed-up symlink Issue FS#24230. If a symlink is broken and included in the removal process of a package, we blew up and segfaulted due to alpm_compute_md5sum() returning NULL and then performing a strcmp() operation. Signed-off-by: Dan McGee --- lib/libalpm/remove.c | 2 +- test/pacman/tests/symlink002.py | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) (limited to 'test') diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c index 7c8a99fb..22ae2bb8 100644 --- a/lib/libalpm/remove.c +++ b/lib/libalpm/remove.c @@ -266,7 +266,7 @@ static void unlink_file(pmpkg_t *info, char *filename, alpm_list_t *skip_remove, FREE(pkghash); } else { char *filehash = alpm_compute_md5sum(file); - int cmp = strcmp(filehash,pkghash); + int cmp = filehash ? strcmp(filehash, pkghash) : 0; FREE(filehash); FREE(pkghash); if(cmp != 0) { diff --git a/test/pacman/tests/symlink002.py b/test/pacman/tests/symlink002.py index 7dcafb0d..6b7423d9 100644 --- a/test/pacman/tests/symlink002.py +++ b/test/pacman/tests/symlink002.py @@ -41,5 +41,3 @@ self.addrule("!FILE_EXIST=etc/nonexistent") self.addrule("FILE_EXIST=etc/exists3") self.addrule("FILE_TYPE=etc/brokenlink3|link") self.addrule("FILE_TYPE=etc/exists3|file") - -self.expectfailure = True -- cgit v1.2.3-70-g09d2