[packages/poldek.git] / poldek-git.patch

commit 3c90766404683407368cab9526d13b0aa8036469
Author: Bartlomiej Zimon <uzi18@o2.pl>
Date:   Wed Mar 21 01:48:26 2012 +0100

    - pndir update: realy keep quiet
    
    Signed-off-by: Bartlomiej Zimon <uzi18@o2.pl>

diff --git a/pkgdir/pndir/update.c b/pkgdir/pndir/update.c
index 830356a..c26fe9f 100644
--- a/pkgdir/pndir/update.c
+++ b/pkgdir/pndir/update.c
@@ -289,8 +289,7 @@ int pndir_m_update(struct pkgdir *pkgdir, enum pkgdir_uprc *uprc)
     pidxpath += 6;
 
     // to keep quiet vf_stat
-    if (poldek_VERBOSE < 2)
-        vfile_configure(VFILE_CONF_VERBOSE, &poldek_VERBOSE);
+    vfile_configure(VFILE_CONF_VERBOSE, 0);
     
     snprintf(path, sizeof(path), "%s.ndir.%s",
 	     pkgdir->idxpath, pidxpath);
commit 55c3e1253032e28eab75bf775b247db4882961f2
Author: Bartlomiej Zimon <uzi18@o2.pl>
Date:   Wed Mar 21 02:23:27 2012 +0100

    - add name for aria fetcher
    
    Signed-off-by: Bartlomiej Zimon <uzi18@o2.pl>

diff --git a/doc/poldek.conf.xml b/doc/poldek.conf.xml
index 5846888..17347e5 100644
--- a/doc/poldek.conf.xml
+++ b/doc/poldek.conf.xml
@@ -729,6 +729,7 @@ proto = http,ftp,https
 cmd   = wget -N --dot-style=binary -P %d %Pn
 
 [fetcher]
+name  = aria
 proto = http,ftp,https
 cmd   = aria2c --log-level=info --summary-interval=0 --truncate-console-readout=true -c -k1M -j5 -s5 -x5 -Z -P -d %d %Pn
 
commit f18bedfa368995550e231f382718029bdc2300df
Author: Marcin Banasiak <marcin.banasiak@gmail.com>
Date:   Sun Feb 19 16:55:35 2012 +0100

    Fix types in tndb_get_all

diff --git a/tndb/read.c b/tndb/read.c
index b57bb50..d560799 100644
--- a/tndb/read.c
+++ b/tndb/read.c
@@ -497,7 +497,8 @@ size_t tndb_get_all(struct tndb *db, const void *key, size_t klen,
 		    void **val)
 {
     off_t  voffs;
-    size_t nread = 0, vlen;
+    size_t nread = 0;
+    unsigned int vlen;
     
     if (tndb_get_voff(db, key, klen, &voffs, &vlen)) {
 	*val = n_malloc(vlen + 1); /* extra byte for \0 */
commit dfe8b3eaefac54fb3decf6bf2393fcac7e58f1db
Author: Arkadiusz Miśkiewicz <arekm@maven.pl>
Date:   Wed Mar 21 20:22:19 2012 +0100

    One more place when parallel conf-xml2 run could cause writting conflict.

diff --git a/doc/conf-xml2.sh b/doc/conf-xml2.sh
index 19a7f9d..844f108 100755
--- a/doc/conf-xml2.sh
+++ b/doc/conf-xml2.sh
@@ -37,10 +37,10 @@ to_conf() {
     perl -pe 's/\[(.?)screen\]/=remove/g; s/\[(.?)\w+\]//g; s/\[\s(\w+)\s\]/[$1]/g;' $FILE > $tmp.tmp
 
     xsl=$DN/conf-xml2conf.xsl
-    perl -pe "s|%\{name\}|$NAME.conf|g" $xsl > $xsl.tmp
+    perl -pe "s|%\{name\}|$NAME.conf|g" $xsl > $xsl.$NAME.tmp
 
     echo "Writing $NAME.conf"
-    xsltproc $xsl.tmp $tmp.tmp |
+    xsltproc $xsl.$NAME.tmp $tmp.tmp |
     # hash text between =xxxstart and =xxxend
     perl -ne 's/^\s+(=xxx\w+)/$1/; $in = 1 if /^=xxxstart/; $in = 0 if /^=xxxend/; if ($in) { s/^\s+([^#])/# $1/; }; print if $_ !~ /^=/' |
     # remove unneeded leading lines and lines with =remove tag
commit 11f27d85144a575cfe27a22d72c3816d36e7a754
Author: Bartlomiej Zimon <uzi18@o2.pl>
Date:   Fri Mar 23 13:37:06 2012 +0100

    - http: shut up 404 errors when verbose = 0
    
    Signed-off-by: Bartlomiej Zimon <uzi18@o2.pl>

diff --git a/vfile/vfff/http.c b/vfile/vfff/http.c
index b85db3a..f233b1a 100644
--- a/vfile/vfff/http.c
+++ b/vfile/vfff/http.c
@@ -44,6 +44,7 @@
 #include <sigint/sigint.h>
 
 #include "vfff.h"
+#include "../vfile_intern.h" // for verbose level
 #include "i18n.h"
 #include "sigint/sigint.h"
 
@@ -674,8 +675,11 @@ static int status_code_ok(int status_code, const char *msg, const char *path)
             is_err = 0;
             break;
             
-        case HTTP_STATUS_NOT_FOUND: 
-            vfff_set_err(ENOENT, _("%s: no such file"), path);
+        case HTTP_STATUS_NOT_FOUND:
+            if (*vfile_conf.verbose > 0) // kill error if verbose = 0
+                vfff_set_err(ENOENT, _("%s: no such file"), path);
+            else
+                is_err = 0;
             break;
             
         case HTTP_STATUS_FORBIDDEN:
commit 0fcb9d8a7fe825c1a4c5f3cff2bd30312b615510
Author: Bartlomiej Zimon <uzi18@o2.pl>
Date:   Wed Mar 28 03:25:18 2012 +0200

    - sort also installed evr column on llu -t,
      just sort before evr array creation
    
    Signed-off-by: Bartlomiej Zimon <uzi18@o2.pl>

diff --git a/cli/ls.c b/cli/ls.c
index fe25dc3..13f2eaa 100644
--- a/cli/ls.c
+++ b/cli/ls.c
@@ -337,7 +337,6 @@ static tn_array *do_upgradeable(struct cmdctx *cmdctx, tn_array *ls_ents,
     return ls_ents2;
 }
 
-    
 
 static int ls(struct cmdctx *cmdctx) 
 {
@@ -346,6 +345,7 @@ static int ls(struct cmdctx *cmdctx)
     int                  rc = 1;
     char                 *path = NULL, pwdpath[PATH_MAX], *pwd;
     unsigned             ldflags = 0;
+    tn_fn_cmp            cmpf;
 
     if (cmdctx->_flags & OPT_LS_INSTALLED)
         ldflags = POCLIDEK_LOAD_INSTALLED;
@@ -364,6 +364,9 @@ static int ls(struct cmdctx *cmdctx)
         goto l_end;
     }
 
+    if ((cmpf = select_cmpf(cmdctx->_flags)))
+         n_array_sort_ex(ls_ents, cmpf);
+
     if (cmdctx->_flags & OPT_LS_UPGRADEABLE) {
         tn_array *tmp;
 
@@ -379,10 +382,6 @@ static int ls(struct cmdctx *cmdctx)
     }
     
     if (n_array_size(ls_ents)) {
-        tn_fn_cmp cmpf;
-        if ((cmpf = select_cmpf(cmdctx->_flags)))
-            n_array_sort_ex(ls_ents, cmpf);
-        
         rc = do_ls(ls_ents, cmdctx, evrs);
         
         if (cmpf)
@@ -419,6 +418,7 @@ static void ls_summary(struct cmdctx *cmdctx, struct pkg *pkg)
     
     if ((s = pkguinf_get(pkgu, PKGUINF_SUMMARY)))
         cmdctx_printf(cmdctx, "    %s\n", s);
+
     pkguinf_free(pkgu);
 }
 
diff --git a/conf.c b/conf.c
index 890a306..2133966 100644
--- a/conf.c
+++ b/conf.c
@@ -1026,7 +1026,10 @@ static tn_hash *do_ldconf(tn_hash *af_htconf,
         goto l_end;
     }
 
-    n_hash_insert(af_htconf, af->path, NULL);
+    if (n_hash_exists(af_htconf, af->path))
+        logn(LOGERR, "%s: included twice", af->path);
+    else
+        n_hash_insert(af_htconf, af->path, NULL);
 
     while (n_stream_gets(af->vf->vf_tnstream, buf, sizeof(buf) - 1)) {
         char *name, *value, *line;
diff --git a/doc/poldek.conf.xml b/doc/poldek.conf.xml
index 17347e5..aae8091 100644
--- a/doc/poldek.conf.xml
+++ b/doc/poldek.conf.xml
@@ -728,7 +728,7 @@ cmd   = vfjuggle %d %Pn
 proto = http,ftp,https
 cmd   = wget -N --dot-style=binary -P %d %Pn
 
-[fetcher]
+[ fetcher ]
 name  = aria
 proto = http,ftp,https
 cmd   = aria2c --log-level=info --summary-interval=0 --truncate-console-readout=true -c -k1M -j5 -s5 -x5 -Z -P -d %d %Pn
diff --git a/install3/ictx.h b/install3/ictx.h
index aa259fb..cc1cab5 100644
--- a/install3/ictx.h
+++ b/install3/ictx.h
@@ -125,6 +125,7 @@ int i3_unmark_package(struct i3ctx *ictx, struct pkg *pkg);
 int i3_is_other_version_marked(struct i3ctx *ictx, struct pkg *pkg,
                                struct capreq *req);
 
+/* marks with PKGMARK_MARK all pkgs with same name prefix */
 int i3_mark_namegroup(struct i3ctx *ictx,
                       struct pkg *pkg, tn_array *pkgs);
 
diff --git a/pkgdir/pndir/update.c b/pkgdir/pndir/update.c
index c26fe9f..9cc4be1 100644
--- a/pkgdir/pndir/update.c
+++ b/pkgdir/pndir/update.c
@@ -361,9 +361,10 @@ int pndir_m_update(struct pkgdir *pkgdir, enum pkgdir_uprc *uprc)
 	
 	msgn(2, "pndir_m_update idxpatches/idxsize: %ld/%ld bytes\n", mdpatchsize, mdsize);
 
-	if (mdpatchsize > mdsize) {
+	if (mdpatchsize * 9 / 10 > mdsize) {
 	    vfile_close(vf);
-	    msgn(1, _("Index patches size too bug\nRetreving index ...\n"));
+	    msgn(1, _("Index patches size too big\n"));
+	    msgn(1, _("Retrieving whole index ...\n"));
 	    rc = update_whole_idx(pkgdir->src);
 	    if (rc)
 	      *uprc = PKGDIR_UPRC_UPTODATE;
diff --git a/pkgfetch.c b/pkgfetch.c
index 9adc155..70e40e3 100644
--- a/pkgfetch.c
+++ b/pkgfetch.c
@@ -252,7 +252,7 @@ int packages_fetch(struct pm_ctx *pmctx,
             nerr++;
         
         else {
-            int j;
+            unsigned int j;
                 
             for (j=0; j < n_array_size(urls); j++) {
                 char localpath[PATH_MAX];
diff --git a/po/de.po b/po/de.po
index b032bf5..c0ce6ca 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: poldek 0.17\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-04 00:17+0200\n"
+"POT-Creation-Date: 2012-04-01 19:50+0200\n"
 "PO-Revision-Date: 2002-04-14 13:05+0100\n"
 "Last-Translator: Andreas Piesk <a.piesk@gmx.net>\n"
 "Language-Team: Polish <pl@li.org>\n"
@@ -15,67 +15,75 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n==0 ? 0 : n==1 ? 1 : 2\n"
 
-#: arg_packages.c:123
+#: arg_packages.c:124
 #, c-format
 msgid "%s:%d: syntax error"
 msgstr "%s:%d: Syntaxfehler"
 
-#: arg_packages.c:125
+#: arg_packages.c:126
 #, fuzzy
 msgid "syntax error in package specification"
 msgstr "Syntaxfehler in Paketdefinition"
 
-#: arg_packages.c:393
+#: arg_packages.c:394
 #, fuzzy, c-format
 msgid "Removed %d duplicates from given packages"
 msgstr "%d doppelte Pakete aus der Liste der angegebenen Pakete entfernt"
 
-#: arg_packages.c:431
+#: arg_packages.c:432
 #, fuzzy, c-format
 msgid "%s: %d package(s) found:"
Commit	Line	Data
e790f566 BZ	1	commit 3c90766404683407368cab9526d13b0aa8036469
	2	Author: Bartlomiej Zimon <uzi18@o2.pl>
	3	Date: Wed Mar 21 01:48:26 2012 +0100
f4205795	4
e790f566 BZ	5	- pndir update: realy keep quiet
	6
	7	Signed-off-by: Bartlomiej Zimon <uzi18@o2.pl>
f4205795	8
e790f566 BZ	9	diff --git a/pkgdir/pndir/update.c b/pkgdir/pndir/update.c
	10	index 830356a..c26fe9f 100644
	11	--- a/pkgdir/pndir/update.c
	12	+++ b/pkgdir/pndir/update.c
	13	@@ -289,8 +289,7 @@ int pndir_m_update(struct pkgdir pkgdir, enum pkgdir_uprc uprc)
	14	pidxpath += 6;
	15
	16	// to keep quiet vf_stat
	17	- if (poldek_VERBOSE < 2)
	18	- vfile_configure(VFILE_CONF_VERBOSE, &poldek_VERBOSE);
	19	+ vfile_configure(VFILE_CONF_VERBOSE, 0);
f4205795	20
e790f566 BZ	21	snprintf(path, sizeof(path), "%s.ndir.%s",
e790f566 BZ	22	pkgdir->idxpath, pidxpath);
bb336a89 BZ	23	commit 55c3e1253032e28eab75bf775b247db4882961f2
	24	Author: Bartlomiej Zimon <uzi18@o2.pl>
	25	Date: Wed Mar 21 02:23:27 2012 +0100
	26
	27	- add name for aria fetcher
	28
	29	Signed-off-by: Bartlomiej Zimon <uzi18@o2.pl>
	30
	31	diff --git a/doc/poldek.conf.xml b/doc/poldek.conf.xml
	32	index 5846888..17347e5 100644
	33	--- a/doc/poldek.conf.xml
	34	+++ b/doc/poldek.conf.xml
	35	@@ -729,6 +729,7 @@ proto = http,ftp,https
	36	cmd = wget -N --dot-style=binary -P %d %Pn
	37
	38	[fetcher]
	39	+name = aria
	40	proto = http,ftp,https
	41	cmd = aria2c --log-level=info --summary-interval=0 --truncate-console-readout=true -c -k1M -j5 -s5 -x5 -Z -P -d %d %Pn
	42
058059bb BZ	43	commit f18bedfa368995550e231f382718029bdc2300df
	44	Author: Marcin Banasiak <marcin.banasiak@gmail.com>
	45	Date: Sun Feb 19 16:55:35 2012 +0100
	46
	47	Fix types in tndb_get_all
	48
	49	diff --git a/tndb/read.c b/tndb/read.c
	50	index b57bb50..d560799 100644
	51	--- a/tndb/read.c
	52	+++ b/tndb/read.c
	53	@@ -497,7 +497,8 @@ size_t tndb_get_all(struct tndb db, const void key, size_t klen,
	54	void **val)
	55	{
	56	off_t voffs;
	57	- size_t nread = 0, vlen;
	58	+ size_t nread = 0;
	59	+ unsigned int vlen;
	60
	61	if (tndb_get_voff(db, key, klen, &voffs, &vlen)) {
	62	val = n_malloc(vlen + 1); / extra byte for \0 */
fe7eabae BZ	63	commit dfe8b3eaefac54fb3decf6bf2393fcac7e58f1db
	64	Author: Arkadiusz Miśkiewicz <arekm@maven.pl>
	65	Date: Wed Mar 21 20:22:19 2012 +0100
	66
	67	One more place when parallel conf-xml2 run could cause writting conflict.
	68
4e656999	69	diff --git a/doc/conf-xml2.sh b/doc/conf-xml2.sh
fe7eabae	70	index 19a7f9d..844f108 100755
4e656999 AM	71	--- a/doc/conf-xml2.sh
	72	+++ b/doc/conf-xml2.sh
	73	@@ -37,10 +37,10 @@ to_conf() {
	74	perl -pe 's/\[(.?)screen\]/=remove/g; s/\[(.?)\w+\]//g; s/\[\s(\w+)\s\]/[$1]/g;' $FILE > $tmp.tmp
	75
	76	xsl=$DN/conf-xml2conf.xsl
	77	- perl -pe "s\|%\{name\}\|$NAME.conf\|g" $xsl > $xsl.tmp
	78	+ perl -pe "s\|%\{name\}\|$NAME.conf\|g" $xsl > $xsl.$NAME.tmp
	79
	80	echo "Writing $NAME.conf"
	81	- xsltproc $xsl.tmp $tmp.tmp \|
	82	+ xsltproc $xsl.$NAME.tmp $tmp.tmp \|
	83	# hash text between =xxxstart and =xxxend
	84	perl -ne 's/^\s+(=xxx\w+)/$1/; $in = 1 if /^=xxxstart/; $in = 0 if /^=xxxend/; if ($in) { s/^\s+([^#])/# $1/; }; print if $_ !~ /^=/' \|
	85	# remove unneeded leading lines and lines with =remove tag
bf32b24f BZ	86	commit 11f27d85144a575cfe27a22d72c3816d36e7a754
	87	Author: Bartlomiej Zimon <uzi18@o2.pl>
	88	Date: Fri Mar 23 13:37:06 2012 +0100
	89
	90	- http: shut up 404 errors when verbose = 0
	91
	92	Signed-off-by: Bartlomiej Zimon <uzi18@o2.pl>
	93
	94	diff --git a/vfile/vfff/http.c b/vfile/vfff/http.c
	95	index b85db3a..f233b1a 100644
	96	--- a/vfile/vfff/http.c
	97	+++ b/vfile/vfff/http.c
	98	@@ -44,6 +44,7 @@
	99	#include <sigint/sigint.h>
	100
	101	#include "vfff.h"
	102	+#include "../vfile_intern.h" // for verbose level
	103	#include "i18n.h"
	104	#include "sigint/sigint.h"
	105
	106	@@ -674,8 +675,11 @@ static int status_code_ok(int status_code, const char msg, const char path)
	107	is_err = 0;
	108	break;
	109
	110	- case HTTP_STATUS_NOT_FOUND:
	111	- vfff_set_err(ENOENT, _("%s: no such file"), path);
	112	+ case HTTP_STATUS_NOT_FOUND:
	113	+ if (*vfile_conf.verbose > 0) // kill error if verbose = 0
	114	+ vfff_set_err(ENOENT, _("%s: no such file"), path);
	115	+ else
	116	+ is_err = 0;
	117	break;
	118
	119	case HTTP_STATUS_FORBIDDEN:
b1732993 BZ	120	commit 0fcb9d8a7fe825c1a4c5f3cff2bd30312b615510
	121	Author: Bartlomiej Zimon <uzi18@o2.pl>
	122	Date: Wed Mar 28 03:25:18 2012 +0200
	123
	124	- sort also installed evr column on llu -t,
	125	just sort before evr array creation
	126
	127	Signed-off-by: Bartlomiej Zimon <uzi18@o2.pl>
	128
	129	diff --git a/cli/ls.c b/cli/ls.c
	130	index fe25dc3..13f2eaa 100644
	131	--- a/cli/ls.c
	132	+++ b/cli/ls.c
	133	@@ -337,7 +337,6 @@ static tn_array do_upgradeable(struct cmdctx cmdctx, tn_array *ls_ents,
	134	return ls_ents2;
	135	}
	136
	137	-
	138
	139	static int ls(struct cmdctx *cmdctx)
	140	{
	141	@@ -346,6 +345,7 @@ static int ls(struct cmdctx *cmdctx)
	142	int rc = 1;
	143	char path = NULL, pwdpath[PATH_MAX], pwd;
	144	unsigned ldflags = 0;
	145	+ tn_fn_cmp cmpf;
	146
	147	if (cmdctx->_flags & OPT_LS_INSTALLED)
	148	ldflags = POCLIDEK_LOAD_INSTALLED;
	149	@@ -364,6 +364,9 @@ static int ls(struct cmdctx *cmdctx)
	150	goto l_end;
	151	}
	152
	153	+ if ((cmpf = select_cmpf(cmdctx->_flags)))
	154	+ n_array_sort_ex(ls_ents, cmpf);
	155	+
	156	if (cmdctx->_flags & OPT_LS_UPGRADEABLE) {
	157	tn_array *tmp;
	158
	159	@@ -379,10 +382,6 @@ static int ls(struct cmdctx *cmdctx)
	160	}
	161
	162	if (n_array_size(ls_ents)) {
	163	- tn_fn_cmp cmpf;
	164	- if ((cmpf = select_cmpf(cmdctx->_flags)))
	165	- n_array_sort_ex(ls_ents, cmpf);
	166	-
	167	rc = do_ls(ls_ents, cmdctx, evrs);
	168
	169	if (cmpf)
	170	@@ -419,6 +418,7 @@ static void ls_summary(struct cmdctx cmdctx, struct pkg pkg)
	171
	172	if ((s = pkguinf_get(pkgu, PKGUINF_SUMMARY)))
	173	cmdctx_printf(cmdctx, " %s\n", s);
	174	+
	175	pkguinf_free(pkgu);
	176	}
	177
fd262321 BZ	178	diff --git a/conf.c b/conf.c
	179	index 890a306..2133966 100644
	180	--- a/conf.c
	181	+++ b/conf.c
	182	@@ -1026,7 +1026,10 @@ static tn_hash do_ldconf(tn_hash af_htconf,
	183	goto l_end;
	184	}
	185
	186	- n_hash_insert(af_htconf, af->path, NULL);
	187	+ if (n_hash_exists(af_htconf, af->path))
	188	+ logn(LOGERR, "%s: included twice", af->path);
	189	+ else
	190	+ n_hash_insert(af_htconf, af->path, NULL);
	191
	192	while (n_stream_gets(af->vf->vf_tnstream, buf, sizeof(buf) - 1)) {
	193	char name, value, *line;
	194	diff --git a/doc/poldek.conf.xml b/doc/poldek.conf.xml
	195	index 17347e5..aae8091 100644
	196	--- a/doc/poldek.conf.xml
	197	+++ b/doc/poldek.conf.xml
	198	@@ -728,7 +728,7 @@ cmd = vfjuggle %d %Pn
	199	proto = http,ftp,https
	200	cmd = wget -N --dot-style=binary -P %d %Pn
	201
	202	-[fetcher]
	203	+[ fetcher ]
	204	name = aria
	205	proto = http,ftp,https
	206	cmd = aria2c --log-level=info --summary-interval=0 --truncate-console-readout=true -c -k1M -j5 -s5 -x5 -Z -P -d %d %Pn
	207	diff --git a/install3/ictx.h b/install3/ictx.h
	208	index aa259fb..cc1cab5 100644
	209	--- a/install3/ictx.h
	210	+++ b/install3/ictx.h
	211	@@ -125,6 +125,7 @@ int i3_unmark_package(struct i3ctx ictx, struct pkg pkg);
	212	int i3_is_other_version_marked(struct i3ctx ictx, struct pkg pkg,
	213	struct capreq *req);
	214
	215	+/* marks with PKGMARK_MARK all pkgs with same name prefix */
	216	int i3_mark_namegroup(struct i3ctx *ictx,
	217	struct pkg pkg, tn_array pkgs);
	218
	219	diff --git a/pkgdir/pndir/update.c b/pkgdir/pndir/update.c
	220	index c26fe9f..9cc4be1 100644
	221	--- a/pkgdir/pndir/update.c
	222	+++ b/pkgdir/pndir/update.c
	223	@@ -361,9 +361,10 @@ int pndir_m_update(struct pkgdir pkgdir, enum pkgdir_uprc uprc)
	224
	225	msgn(2, "pndir_m_update idxpatches/idxsize: %ld/%ld bytes\n", mdpatchsize, mdsize);
	226
	227	- if (mdpatchsize > mdsize) {
	228	+ if (mdpatchsize * 9 / 10 > mdsize) {
	229	vfile_close(vf);
	230	- msgn(1, _("Index patches size too bug\nRetreving index ...\n"));
	231	+ msgn(1, _("Index patches size too big\n"));
	232	+ msgn(1, _("Retrieving whole index ...\n"));
	233	rc = update_whole_idx(pkgdir->src);
	234	if (rc)
	235	*uprc = PKGDIR_UPRC_UPTODATE;
	236	diff --git a/pkgfetch.c b/pkgfetch.c
	237	index 9adc155..70e40e3 100644
	238	--- a/pkgfetch.c
	239	+++ b/pkgfetch.c
	240	@@ -252,7 +252,7 @@ int packages_fetch(struct pm_ctx *pmctx,
	241	nerr++;
242
243	else {
244	- int j;
245	+ unsigned int j;
246
247	for (j=0; j < n_array_size(urls); j++) {
248	char localpath[PATH_MAX];
249	diff --git a/po/de.po b/po/de.po
250	index b032bf5..c0ce6ca 100644
251	--- a/po/de.po
252	+++ b/po/de.po
253	@@ -6,7 +6,7 @@ msgid ""
254	msgstr ""
255	"Project-Id-Version: poldek 0.17\n"
256	"Report-Msgid-Bugs-To: \n"
257	-"POT-Creation-Date: 2009-03-04 00:17+0200\n"
258	+"POT-Creation-Date: 2012-04-01 19:50+0200\n"
259	"PO-Revision-Date: 2002-04-14 13:05+0100\n"
260	"Last-Translator: Andreas Piesk <a.piesk@gmx.net>\n"
261	"Language-Team: Polish <pl@li.org>\n"
262	@@ -15,67 +15,75 @@ msgstr ""
263	"Content-Transfer-Encoding: 8bit\n"
264	"Plural-Forms: nplurals=3; plural=n==0 ? 0 : n==1 ? 1 : 2\n"
265
266	-#: arg_packages.c:123
267	+#: arg_packages.c:124
268	#, c-format
269	msgid "%s:%d: syntax error"
270	msgstr "%s:%d: Syntaxfehler"
271
272	-#: arg_packages.c:125
273	+#: arg_packages.c:126
274	#, fuzzy
275	msgid "syntax error in package specification"
276	msgstr "Syntaxfehler in Paketdefinition"
277
278	-#: arg_packages.c:393
279	+#: arg_packages.c:394
280	#, fuzzy, c-format
281	msgid "Removed %d duplicates from given packages"
282	msgstr "%d doppelte Pakete aus der Liste der angegebenen Pakete entfernt"
283
284	-#: arg_packages.c:431
285	+#: arg_packages.c:432
286	#, fuzzy, c-format
287	msgid "%s: %d package(s) found:"
288