]> git.ipfire.org Git - people/ms/ipfire-3.x.git/commitdiff
pakfire: Fix for database conversion.
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 24 Sep 2013 23:56:06 +0000 (00:56 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 24 Sep 2013 23:56:06 +0000 (00:56 +0100)
pakfire/pakfire.nm
pakfire/patches/0001-Fix-database-conversion.patch [new file with mode: 0644]

index 278b03572537d78e96ff6c5faf05251a7fd89c0a..3fb99bfa535621dcab78c9f1a5bef0dbbbe2687b 100644 (file)
@@ -5,7 +5,7 @@
 
 name       = pakfire
 version    = 0.9.26
-release    = 1
+release    = 2
 
 maintainer = Michael Tremer <michael.tremer@ipfire.org>
 groups     = System/Packaging
diff --git a/pakfire/patches/0001-Fix-database-conversion.patch b/pakfire/patches/0001-Fix-database-conversion.patch
new file mode 100644 (file)
index 0000000..3ba0558
--- /dev/null
@@ -0,0 +1,27 @@
+From 32468054fe6aa6d181388252ac4c3f6286dfacf1 Mon Sep 17 00:00:00 2001
+From: Michael Tremer <michael.tremer@ipfire.org>
+Date: Wed, 25 Sep 2013 00:51:36 +0100
+Subject: [PATCH] Fix database conversion.
+
+The new dependencies table was not correctly generated
+from older databases, which is fixed in this patch.
+---
+ src/pakfire/repository/database.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/pakfire/repository/database.py b/src/pakfire/repository/database.py
+index d22bdb5..379ae1c 100644
+--- a/src/pakfire/repository/database.py
++++ b/src/pakfire/repository/database.py
+@@ -281,7 +281,7 @@ class DatabaseLocal(Database):
+                               for type, deps in dependencies:
+                                       c.executemany("INSERT INTO dependencies(pkg, type, dependency) VALUES(?, ?, ?)",
+-                                              ((pkg_id, type, d) for d in deps))
++                                              ((pkg_id, type, d) for d in deps.splitlines()))
+                       c.executescript("""
+                               CREATE TABLE packages_(
+-- 
+1.8.3.1
+