diff options
| author | Aaron Griffin <aaron@archlinux.org> | 2006-10-16 01:54:43 +0200 |
|---|---|---|
| committer | Aaron Griffin <aaron@archlinux.org> | 2006-10-16 01:54:43 +0200 |
| commit | ac30eb2c1e452df5c4e4992038b24b26cfcd5ced (patch) | |
| tree | 7f64aa644a961c55f6f8e58eb16c2d54e661d81c /src/pacman/trans.c | |
| parent | 04c48b4547e2a0710b0160b43644310f52db25f0 (diff) | |
| download | pacman-ac30eb2c1e452df5c4e4992038b24b26cfcd5ced.tar.gz pacman-ac30eb2c1e452df5c4e4992038b24b26cfcd5ced.tar.xz | |
Applied Frugalware patch from Christian Hamar alias krix <krics@linuxforum.hu>
for file-conflict progress bar
Also did some CVS cleanup, removing some of the autogenerated files that
shouldn't have been there
Diffstat (limited to 'src/pacman/trans.c')
| -rw-r--r-- | src/pacman/trans.c | 48 |
1 files changed, 39 insertions, 9 deletions
diff --git a/src/pacman/trans.c b/src/pacman/trans.c index 2f770cf0..29e55791 100644 --- a/src/pacman/trans.c +++ b/src/pacman/trans.c @@ -57,7 +57,9 @@ void cb_trans_evt(unsigned char event, void *data1, void *data2) pm_fprintf(stderr, NL, _("checking dependencies... ")); break; case PM_TRANS_EVT_FILECONFLICTS_START: - pm_fprintf(stderr, NL, _("checking for file conflicts... ")); + if(config->noprogressbar) { + MSG(NL, _("checking for file conflicts... ")); + } break; case PM_TRANS_EVT_RESOLVEDEPS_START: pm_fprintf(stderr, NL, _("resolving dependencies... ")); @@ -65,8 +67,14 @@ void cb_trans_evt(unsigned char event, void *data1, void *data2) case PM_TRANS_EVT_INTERCONFLICTS_START: pm_fprintf(stderr, NL, _("looking for inter-conflicts... ")); break; - case PM_TRANS_EVT_CHECKDEPS_DONE: case PM_TRANS_EVT_FILECONFLICTS_DONE: + if(config->noprogressbar) { + MSG(CL, _("done.\n")); + } else { + MSG(NL, ""); + } + break; + case PM_TRANS_EVT_CHECKDEPS_DONE: case PM_TRANS_EVT_RESOLVEDEPS_DONE: case PM_TRANS_EVT_INTERCONFLICTS_DONE: pm_fprintf(stderr, CL, _("done.\n")); @@ -282,10 +290,11 @@ void cb_trans_progress(unsigned char event, char *pkgname, int percent, int howm { int i, hash; unsigned int maxpkglen, progresslen = maxcols - 57; - char *addstr, *upgstr, *removestr, *ptr; + char *addstr, *upgstr, *removestr, *conflictstr, *ptr; addstr = strdup(_("installing")); upgstr = strdup(_("upgrading")); removestr = strdup(_("removing")); + conflictstr = strdup(_("checking for file conflicts")); if(config->noprogressbar) { return; @@ -307,9 +316,14 @@ void cb_trans_progress(unsigned char event, char *pkgname, int percent, int howm case PM_TRANS_PROGRESS_UPGRADE_START: ptr = upgstr; break; + case PM_TRANS_PROGRESS_REMOVE_START: ptr = removestr; break; + + case PM_TRANS_PROGRESS_CONFLICTS_START: + ptr = conflictstr; + break; } hash=percent*progresslen/100; @@ -318,13 +332,29 @@ void cb_trans_progress(unsigned char event, char *pkgname, int percent, int howm if(strlen(pkgname)>maxpkglen) pkgname[maxpkglen]='\0'; - putchar('('); - for(i=0;i<(int)log10(howmany)-(int)log10(remain);i++) - putchar(' '); - printf("%d/%d) %s %s ", remain, howmany, ptr, pkgname); - if (strlen(pkgname)<maxpkglen) - for (i=maxpkglen-strlen(pkgname)-1; i>0; i--) + switch (event) { + case PM_TRANS_PROGRESS_ADD_START: + case PM_TRANS_PROGRESS_UPGRADE_START: + case PM_TRANS_PROGRESS_REMOVE_START: + putchar('('); + for(i=0;i<(int)log10(howmany)-(int)log10(remain);i++) + putchar(' '); + printf("%d/%d) %s %s ", remain, howmany, ptr, pkgname); + if (strlen(pkgname)<maxpkglen) + for (i=maxpkglen-strlen(pkgname)-1; i>0; i--) + putchar(' '); + break; + + case PM_TRANS_PROGRESS_CONFLICTS_START: + printf("%s (", ptr); + for(i=0;i<(int)log10(howmany)-(int)log10(remain);i++) + putchar(' '); + printf("%d/%d) ", remain, howmany); + for (i=maxpkglen; i>0; i--) putchar(' '); + break; + } + printf("["); for (i = progresslen; i > 0; i--) { if (i >= progresslen - hash) |