From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 6ea95467a15b6450cb8b05c4caeed2c9e1959554
Date: Wed, 25 Sep 2013 01:56:42 +0200 [thread overview]
Message-ID: <20130924235643.7AE1420F84@argus.ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 2807 bytes --]
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 3.x development tree".
The branch, master has been updated
via 6ea95467a15b6450cb8b05c4caeed2c9e1959554 (commit)
from de0ca5b0d9c8e74ed2cce66980414c6f6e4b9f4c (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 6ea95467a15b6450cb8b05c4caeed2c9e1959554
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Sep 25 00:56:06 2013 +0100
pakfire: Fix for database conversion.
-----------------------------------------------------------------------
Summary of changes:
pakfire/pakfire.nm | 2 +-
pakfire/patches/0001-Fix-database-conversion.patch | 27 ++++++++++++++++++++++
2 files changed, 28 insertions(+), 1 deletion(-)
create mode 100644 pakfire/patches/0001-Fix-database-conversion.patch
Difference in files:
diff --git a/pakfire/pakfire.nm b/pakfire/pakfire.nm
index 278b035..3fb99bf 100644
--- a/pakfire/pakfire.nm
+++ b/pakfire/pakfire.nm
@@ -5,7 +5,7 @@
name = pakfire
version = 0.9.26
-release = 1
+release = 2
maintainer = Michael Tremer <michael.tremer(a)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
index 0000000..3ba0558
--- /dev/null
+++ b/pakfire/patches/0001-Fix-database-conversion.patch
@@ -0,0 +1,27 @@
+From 32468054fe6aa6d181388252ac4c3f6286dfacf1 Mon Sep 17 00:00:00 2001
+From: Michael Tremer <michael.tremer(a)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
+
hooks/post-receive
--
IPFire 3.x development tree
reply other threads:[~2013-09-24 23:56 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130924235643.7AE1420F84@argus.ipfire.org \
--to=git@ipfire.org \
--cc=ipfire-scm@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox