]>
Commit | Line | Data |
---|---|---|
abe41be2 | 1 | Index: install/install.c |
2 | =================================================================== | |
3 | RCS file: /cvsroot/poldek/poldek/install/install.c,v | |
4 | retrieving revision 1.10 | |
5 | diff -u -r1.10 install.c | |
6 | --- install/install.c 1 Jul 2007 21:04:26 -0000 1.10 | |
7 | +++ install/install.c 4 Jul 2007 13:41:03 -0000 | |
8 | @@ -327,6 +327,12 @@ | |
9 | return nmarked; | |
10 | } | |
11 | ||
12 | +static void ts_reset(struct poldek_ts *ts) | |
13 | +{ | |
14 | + pkgmark_massset(ts->pms, 0, PKGMARK_MARK | PKGMARK_DEP); | |
15 | + n_hash_clean(ts->ts_summary); | |
16 | +} | |
17 | + | |
18 | int in_do_poldek_ts_install(struct poldek_ts *ts) | |
19 | { | |
20 | int i, nmarked = 0, nerr = 0, n, is_particle; | |
21 | @@ -422,7 +428,7 @@ | |
22 | if (!do_install(&ictx)) | |
23 | nerr++; | |
24 | ||
25 | - pkgmark_massset(ts->pms, 0, PKGMARK_MARK | PKGMARK_DEP); | |
26 | + ts_reset(ictx.ts); | |
27 | install_ctx_reset(&ictx); | |
28 | } | |
29 | } | |
30 | Index: log.c | |
31 | =================================================================== | |
32 | RCS file: /cvsroot/poldek/poldek/log.c,v | |
33 | retrieving revision 1.32 | |
34 | diff -u -r1.32 log.c | |
35 | --- log.c 2 Jul 2007 17:08:38 -0000 1.32 | |
36 | +++ log.c 4 Jul 2007 13:44:04 -0000 | |
37 | @@ -173,7 +173,6 @@ | |
38 | /* auto line break for errors and warnings */ | |
39 | if (!last_endlined && !is_continuation && (pri & (LOGERR|LOGWARN))) { | |
40 | buf[buf_len++] = '\n'; | |
41 | - n_assert(0); | |
42 | } | |
43 | ||
44 | last_endlined = is_endlined; |