summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2011-06-30 12:02:33 -0500
committerDan McGee <dan@archlinux.org>2011-06-30 12:02:33 -0500
commit35ffe6af2d8d38849a7711a4c6add3d14490816c (patch)
treef7c89136edb0ad4d15ca708b0bfea6654e697ba3
parent0ed848a9ea7a543192cef1ca78695a9046ee4e98 (diff)
downloadpacman-35ffe6af2d8d38849a7711a4c6add3d14490816c.tar.xz
pactest: remove no longer necessary newline hacks
libalpm can now cope with this as of commit 719e0d3ddb300. Signed-off-by: Dan McGee <dan@archlinux.org>
-rw-r--r--test/pacman/pmdb.py6
-rw-r--r--test/pacman/pmpkg.py1
2 files changed, 3 insertions, 4 deletions
diff --git a/test/pacman/pmdb.py b/test/pacman/pmdb.py
index 90b817ac..63a156ec 100644
--- a/test/pacman/pmdb.py
+++ b/test/pacman/pmdb.py
@@ -207,17 +207,17 @@ class pmdb(object):
make_section(data, "MD5SUM", pkg.md5sum)
make_section(data, "PGPSIG", pkg.pgpsig)
- entry["desc"] = "\n".join(data) + "\n"
+ entry["desc"] = "\n".join(data)
# files and install
if self.is_local:
data = []
make_section(data, "FILES", pkg.full_filelist())
make_section(data, "BACKUP", pkg.local_backup_entries())
- entry["files"] = "\n".join(data) + "\n"
+ entry["files"] = "\n".join(data)
if any(pkg.install.values()):
- entry["install"] = pkg.installfile() + "\n"
+ entry["install"] = pkg.installfile()
return entry
diff --git a/test/pacman/pmpkg.py b/test/pacman/pmpkg.py
index 8e6d7c43..7aa77f6a 100644
--- a/test/pacman/pmpkg.py
+++ b/test/pacman/pmpkg.py
@@ -136,7 +136,6 @@ class pmpkg(object):
data.append("provides = %s" % i)
for i in self.backup:
data.append("backup = %s" % i)
- data.append("\n")
archive_files.append((".PKGINFO", "\n".join(data)))
# .INSTALL