]>
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", |
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 |