Date:2010-11-22 00:48:24 (13 years 4 months ago)
Author:Werner Almesberger
Commit:e1404bb6a2a8a09d82e0bb600cc859addc46de19
Message:qpkg/prereq.c (print_debug, resolve): moved debug output to separate function

Files: qpkg/prereq.c (2 diffs)

Change Details

qpkg/prereq.c
171171}
172172
173173
174static void print_debug(const struct pkg *pkg, const struct stack *top,
175    int level)
176{
177    const struct stack *p;
178
179    fprintf(stderr, "%*s", level, "");
180    fprintf(stderr, "%.*s %p", ID2PF(pkg->id), pkg);
181    if (pkg->version)
182        fprintf(stderr, " %.*s", ID2PF(pkg->version));
183    fprintf(stderr, " (");
184    for (p = top; p; p = p->next)
185        fprintf(stderr, "%s%.*s",
186            p == top ? "" : " ", ID2PF(p->pkg->id));
187    fprintf(stderr, ")");
188    if (pkg->mark)
189        fprintf(stderr, " +");
190    if (pkg->flags & QPKG_INSTALLED)
191        fprintf(stderr, " ***");
192    fprintf(stderr, "\n");
193}
194
195
174196static void resolve(struct list *next_dep, const struct ref *dep,
175197    struct stack *top, struct list *conf)
176198{
...... 
196218    for (pkg = dep->pkg->jrb->val; pkg; pkg = pkg->more) {
197219        if (best && n_install == n_best)
198220            return;
199        if (debug) {
200            struct stack *p;
201
202            fprintf(stderr, "%*s", level, "");
203            fprintf(stderr, "%.*s %p", ID2PF(pkg->id), pkg);
204            if (pkg->version)
205                fprintf(stderr, " %.*s", ID2PF(pkg->version));
206            fprintf(stderr, " (");
207            for (p = top; p; p = p->next)
208                fprintf(stderr, "%s%.*s",
209                    p == top ? "" : " ", ID2PF(p->pkg->id));
210            fprintf(stderr, ")");
211            if (pkg->mark)
212                fprintf(stderr, " +");
213            if (pkg->flags & QPKG_INSTALLED)
214                fprintf(stderr, " ***");
215            fprintf(stderr, "\n");
216        }
221        if (debug)
222            print_debug(pkg, top, level);
217223        if (!satisfies(pkg, dep))
218224            continue;
219225        if (pkg->flags & QPKG_ADDING) {

Archive Download the corresponding diff file

Branches:
master



interactive