1 commit 3c90766404683407368cab9526d13b0aa8036469
2 Author: Bartlomiej Zimon <uzi18@o2.pl>
3 Date: Wed Mar 21 01:48:26 2012 +0100
5 - pndir update: realy keep quiet
7 Signed-off-by: Bartlomiej Zimon <uzi18@o2.pl>
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)
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);
21 snprintf(path, sizeof(path), "%s.ndir.%s",
22 pkgdir->idxpath, pidxpath);
23 commit 55c3e1253032e28eab75bf775b247db4882961f2
24 Author: Bartlomiej Zimon <uzi18@o2.pl>
25 Date: Wed Mar 21 02:23:27 2012 +0100
27 - add name for aria fetcher
29 Signed-off-by: Bartlomiej Zimon <uzi18@o2.pl>
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
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
43 commit f18bedfa368995550e231f382718029bdc2300df
44 Author: Marcin Banasiak <marcin.banasiak@gmail.com>
45 Date: Sun Feb 19 16:55:35 2012 +0100
47 Fix types in tndb_get_all
49 diff --git a/tndb/read.c b/tndb/read.c
50 index b57bb50..d560799 100644
53 @@ -497,7 +497,8 @@ size_t tndb_get_all(struct tndb *db, const void *key, size_t klen,
57 - size_t nread = 0, vlen;
61 if (tndb_get_voff(db, key, klen, &voffs, &vlen)) {
62 *val = n_malloc(vlen + 1); /* extra byte for \0 */
63 commit dfe8b3eaefac54fb3decf6bf2393fcac7e58f1db
64 Author: Arkadiusz MiĆkiewicz <arekm@maven.pl>
65 Date: Wed Mar 21 20:22:19 2012 +0100
67 One more place when parallel conf-xml2 run could cause writting conflict.
69 diff --git a/doc/conf-xml2.sh b/doc/conf-xml2.sh
70 index 19a7f9d..844f108 100755
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
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
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
86 commit 11f27d85144a575cfe27a22d72c3816d36e7a754
87 Author: Bartlomiej Zimon <uzi18@o2.pl>
88 Date: Fri Mar 23 13:37:06 2012 +0100
90 - http: shut up 404 errors when verbose = 0
92 Signed-off-by: Bartlomiej Zimon <uzi18@o2.pl>
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
99 #include <sigint/sigint.h>
102 +#include "../vfile_intern.h" // for verbose level
104 #include "sigint/sigint.h"
106 @@ -674,8 +675,11 @@ static int status_code_ok(int status_code, const char *msg, const char *path)
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);
119 case HTTP_STATUS_FORBIDDEN:
120 commit 0fcb9d8a7fe825c1a4c5f3cff2bd30312b615510
121 Author: Bartlomiej Zimon <uzi18@o2.pl>
122 Date: Wed Mar 28 03:25:18 2012 +0200
124 - sort also installed evr column on llu -t,
125 just sort before evr array creation
127 Signed-off-by: Bartlomiej Zimon <uzi18@o2.pl>
129 diff --git a/cli/ls.c b/cli/ls.c
130 index fe25dc3..13f2eaa 100644
133 @@ -337,7 +337,6 @@ static tn_array *do_upgradeable(struct cmdctx *cmdctx, tn_array *ls_ents,
139 static int ls(struct cmdctx *cmdctx)
141 @@ -346,6 +345,7 @@ static int ls(struct cmdctx *cmdctx)
143 char *path = NULL, pwdpath[PATH_MAX], *pwd;
144 unsigned ldflags = 0;
147 if (cmdctx->_flags & OPT_LS_INSTALLED)
148 ldflags = POCLIDEK_LOAD_INSTALLED;
149 @@ -364,6 +364,9 @@ static int ls(struct cmdctx *cmdctx)
153 + if ((cmpf = select_cmpf(cmdctx->_flags)))
154 + n_array_sort_ex(ls_ents, cmpf);
156 if (cmdctx->_flags & OPT_LS_UPGRADEABLE) {
159 @@ -379,10 +382,6 @@ static int ls(struct cmdctx *cmdctx)
162 if (n_array_size(ls_ents)) {
164 - if ((cmpf = select_cmpf(cmdctx->_flags)))
165 - n_array_sort_ex(ls_ents, cmpf);
167 rc = do_ls(ls_ents, cmdctx, evrs);
170 @@ -419,6 +418,7 @@ static void ls_summary(struct cmdctx *cmdctx, struct pkg *pkg)
172 if ((s = pkguinf_get(pkgu, PKGUINF_SUMMARY)))
173 cmdctx_printf(cmdctx, " %s\n", s);