TarInfo objects default to mode 0644 while mkfile in util.py uses 0755,
causing pacman warnings about differing permissions on tests involving
package updates. Set the mode on TarInfo objects to 0755 unless the
test specifies a different mode.
Bug referenced in FS#30723.
Signed-off-by: Andrew Gregory
---
test/pacman/pmpkg.py | 2 ++
test/pacman/tests/mode001.py | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/test/pacman/pmpkg.py b/test/pacman/pmpkg.py
index 988c73f..250d45b 100644
--- a/test/pacman/pmpkg.py
+++ b/test/pacman/pmpkg.py
@@ -160,6 +160,8 @@ def makepkg(self, path):
info = tarfile.TarInfo(fileinfo["filename"])
if fileinfo["hasperms"]:
info.mode = fileinfo["perms"]
+ else:
+ info.mode = 0755
if fileinfo["isdir"]:
info.type = tarfile.DIRTYPE
tar.addfile(info)
diff --git a/test/pacman/tests/mode001.py b/test/pacman/tests/mode001.py
index 4ec11e1..db886e7 100644
--- a/test/pacman/tests/mode001.py
+++ b/test/pacman/tests/mode001.py
@@ -9,4 +9,4 @@
self.addrule("PACMAN_RETCODE=0")
for f in p.files:
- self.addrule("FILE_MODE=%s|644" % f)
+ self.addrule("FILE_MODE=%s|755" % f)
--
1.8.2