public inbox for ipfire-scm@lists.ipfire.org
 help / color / mirror / Atom feed
From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 95607af0fef23f42757daa640507b2da5e18051c
Date: Mon, 04 Mar 2013 17:28:29 +0100	[thread overview]
Message-ID: <20130304162854.6B9492010D@argus.ipfire.org> (raw)

[-- Attachment #1: Type: text/plain, Size: 3254 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 2.x development tree".

The branch, next has been updated
       via  95607af0fef23f42757daa640507b2da5e18051c (commit)
      from  624120beed20047dcf35b4975566a21a874bb8b2 (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 95607af0fef23f42757daa640507b2da5e18051c
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Mon Mar 4 17:27:50 2013 +0100

    pakfire3: Fix database inst_size error.

-----------------------------------------------------------------------

Summary of changes:
 lfs/pakfire3                                       |  3 ++-
 ...d-inst_size-column-when-creating-new-data.patch | 24 ++++++++++++++++++++++
 2 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 src/patches/pakfire-database-Add-inst_size-column-when-creating-new-data.patch

Difference in files:
diff --git a/lfs/pakfire3 b/lfs/pakfire3
index d31c183..8fb810d 100644
--- a/lfs/pakfire3
+++ b/lfs/pakfire3
@@ -32,7 +32,7 @@ DL_FROM    = http://source.ipfire.org/releases/pakfire/
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG	   = pakfire3
-PAK_VER    = 3
+PAK_VER    = 4
 
 DEPS       = "libsolv pycurl pygpgme python-progressbar python-xattr sqlite urlgrabber"
 
@@ -78,6 +78,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/pakfire3-changes-for-ipfire2.diff
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/pakfire-database-Add-inst_size-column-when-creating-new-data.patch
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 	rm -vf /usr/bin/pakfire3
diff --git a/src/patches/pakfire-database-Add-inst_size-column-when-creating-new-data.patch b/src/patches/pakfire-database-Add-inst_size-column-when-creating-new-data.patch
new file mode 100644
index 0000000..f366f21
--- /dev/null
+++ b/src/patches/pakfire-database-Add-inst_size-column-when-creating-new-data.patch
@@ -0,0 +1,24 @@
+From 0d6d6fd2b89c609a6f8daff225c6c98b54a041cc Mon Sep 17 00:00:00 2001
+From: Michael Tremer <michael.tremer(a)ipfire.org>
+Date: Mon, 4 Mar 2013 17:18:52 +0100
+Subject: [PATCH] database: Add inst_size column when creating new databases.
+
+---
+ python/pakfire/repository/database.py | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/python/pakfire/repository/database.py b/python/pakfire/repository/database.py
+index fc8a1a9..d8751e9 100644
+--- a/python/pakfire/repository/database.py
++++ b/python/pakfire/repository/database.py
+@@ -190,6 +190,7 @@ class DatabaseLocal(Database):
+ 				groups		TEXT,
+ 				filename	TEXT,
+ 				size		INTEGER,
++				inst_size	INTEGER,
+ 				hash1		TEXT,
+ 				provides	TEXT,
+ 				requires	TEXT,
+-- 
+1.7.11.7
+


hooks/post-receive
--
IPFire 2.x development tree

                 reply	other threads:[~2013-03-04 16:28 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=20130304162854.6B9492010D@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