Merge branch 'maint'

4 files changed, 73 insertions, 1 deletions

diff --git a/test/pacman/tests/fileconflict007.py b/test/pacman/tests/fileconflict007.py
index 7e6d85ef..4ee4624e 100644
--- a/test/pacman/tests/fileconflict007.py
+++ b/test/pacman/tests/fileconflict007.py
@@ -3,7 +3,7 @@ self.description = "Fileconflict with symlinks (klibc case)"
 lp = pmpkg("pkg")
 lp.files = ["dir/realdir/",
             "dir/symdir -> realdir",
-	    "dir/realdir/file"]
+            "dir/realdir/file"]
 self.addpkg2db("local", lp)
 
 p = pmpkg("pkg", "1.0-2")
diff --git a/test/pacman/tests/symlink010.py b/test/pacman/tests/symlink010.py
new file mode 100644
index 00000000..a1e562e1
--- /dev/null
+++ b/test/pacman/tests/symlink010.py
@@ -0,0 +1,24 @@
+self.description = "Unowned identical symlink pointing to file in package"
+
+lp = pmpkg("dummy")
+lp.files = ["usr/bin/myprog"]
+self.addpkg2db("local", lp)
+
+self.filesystem = ["usr/bin/otherprog",
+                   "usr/bin/myprogsuffix -> myprog"]
+
+p = pmpkg("dummy", "1.0-2")
+p.files = ["usr/bin/myprog",
+           "usr/bin/myprogsuffix -> myprog"]
+self.addpkg(p)
+
+self.args = "-U %s" % p.filename()
+
+self.addrule("PACMAN_RETCODE=1")
+self.addrule("PKG_VERSION=dummy|1.0-1")
+self.addrule("FILE_EXIST=usr/bin/myprog")
+self.addrule("LINK_EXIST=usr/bin/myprogsuffix")
+self.addrule("FILE_EXIST=usr/bin/otherprog")
+self.addrule("FILE_TYPE=usr/bin/myprog|file")
+self.addrule("FILE_TYPE=usr/bin/myprogsuffix|link")
+self.addrule("FILE_TYPE=usr/bin/otherprog|file")
diff --git a/test/pacman/tests/symlink011.py b/test/pacman/tests/symlink011.py
new file mode 100644
index 00000000..93cd9ddf
--- /dev/null
+++ b/test/pacman/tests/symlink011.py
@@ -0,0 +1,24 @@
+self.description = "Unowned broken symlink replaced by one in package"
+
+lp = pmpkg("dummy")
+lp.files = ["usr/bin/myprog"]
+self.addpkg2db("local", lp)
+
+self.filesystem = ["usr/bin/otherprog",
+                   "usr/bin/myprogsuffix -> broken"]
+
+p = pmpkg("dummy", "1.0-2")
+p.files = ["usr/bin/myprog",
+           "usr/bin/myprogsuffix -> myprog"]
+self.addpkg(p)
+
+self.args = "-U %s" % p.filename()
+
+self.addrule("PACMAN_RETCODE=1")
+self.addrule("PKG_VERSION=dummy|1.0-1")
+self.addrule("FILE_EXIST=usr/bin/myprog")
+self.addrule("LINK_EXIST=usr/bin/myprogsuffix")
+self.addrule("FILE_EXIST=usr/bin/otherprog")
+self.addrule("FILE_TYPE=usr/bin/myprog|file")
+self.addrule("FILE_TYPE=usr/bin/myprogsuffix|link")
+self.addrule("FILE_TYPE=usr/bin/otherprog|file")
diff --git a/test/pacman/tests/symlink012.py b/test/pacman/tests/symlink012.py
new file mode 100644
index 00000000..6a73bbbc
--- /dev/null
+++ b/test/pacman/tests/symlink012.py
@@ -0,0 +1,24 @@
+self.description = "Unowned symlink when pointing to different file"
+
+lp = pmpkg("dummy")
+lp.files = ["usr/bin/myprog"]
+self.addpkg2db("local", lp)
+
+self.filesystem = ["usr/bin/otherprog",
+                   "usr/bin/myprogsuffix -> otherprog"]
+
+p = pmpkg("dummy", "1.0-2")
+p.files = ["usr/bin/myprog",
+           "usr/bin/myprogsuffix -> myprog"]
+self.addpkg(p)
+
+self.args = "-U %s" % p.filename()
+
+self.addrule("PACMAN_RETCODE=1")
+self.addrule("PKG_VERSION=dummy|1.0-1")
+self.addrule("FILE_EXIST=usr/bin/myprog")
+self.addrule("LINK_EXIST=usr/bin/myprogsuffix")
+self.addrule("FILE_EXIST=usr/bin/otherprog")
+self.addrule("FILE_TYPE=usr/bin/myprog|file")
+self.addrule("FILE_TYPE=usr/bin/myprogsuffix|link")
+self.addrule("FILE_TYPE=usr/bin/otherprog|file")