commit 3c90766404683407368cab9526d13b0aa8036469 Author: Bartlomiej Zimon Date: Wed Mar 21 01:48:26 2012 +0100 - pndir update: realy keep quiet Signed-off-by: Bartlomiej Zimon 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 Date: Wed Mar 21 02:23:27 2012 +0100 - add name for aria fetcher Signed-off-by: Bartlomiej Zimon 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 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 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 Date: Fri Mar 23 13:37:06 2012 +0100 - http: shut up 404 errors when verbose = 0 Signed-off-by: Bartlomiej Zimon 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 #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 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 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); }