- Pacman-dev - lists.archlinux.org

[pacman-dev] CVS update of pacman-lib (10 files)
by Aaron Griffin 04 Feb '07

04 Feb '07

Date: Sunday, February 4, 2007 @ 03:26:53 Author: aaron Path: /home/cvs-pacman/pacman-lib Modified: lib/libalpm/alpm.c (1.110 -> 1.111) lib/libalpm/alpm.h (1.70 -> 1.71) lib/libalpm/package.c (1.56 -> 1.57) lib/libalpm/package.h (1.24 -> 1.25) lib/libalpm/sync.c (1.97 -> 1.98) src/pacman/conf.h (1.14 -> 1.15) src/pacman/pacman.c (1.86 -> 1.87) src/pacman/query.c (1.21 -> 1.22) src/pacman/util.c (1.26 -> 1.27) src/pacman/util.h (1.15 -> 1.16) Implemented a crappy version of -Qu (query upgrades). This simply outputs the packages to be upgraded in a -Su operation. Much of the code is duplicated from sync.c. TODO: move the implementation to upgrades.c, and reimplement the sync_sysupgrade function in terms of this: trans->packages = alpm_get_upgrades(); -----------------------+ lib/libalpm/alpm.c | 154 ++++++++++++++++++++++++++++++++++++++++++++++++ lib/libalpm/alpm.h | 2 lib/libalpm/package.c | 11 +++ lib/libalpm/package.h | 2 lib/libalpm/sync.c | 15 ---- src/pacman/conf.h | 1 src/pacman/pacman.c | 2 src/pacman/query.c | 13 ++++ src/pacman/util.c | 4 - src/pacman/util.h | 2 10 files changed, 188 insertions(+), 18 deletions(-) Index: pacman-lib/lib/libalpm/alpm.c diff -u pacman-lib/lib/libalpm/alpm.c:1.110 pacman-lib/lib/libalpm/alpm.c:1.111 --- pacman-lib/lib/libalpm/alpm.c:1.110 Wed Jan 31 01:10:21 2007 +++ pacman-lib/lib/libalpm/alpm.c Sun Feb 4 03:26:52 2007 @@ -1078,4 +1078,158 @@ /** @} */ +/* This function is mostly the same as sync.c find_replacements and sysupgrade + * functions, and we should be able to combine them - this is an interim + * solution made for -Qu operation */ +alpm_list_t *alpm_get_upgrades() +{ + int found = 0; + alpm_list_t *syncpkgs = NULL; + alpm_list_t *i, *j, *k; + + ALPM_LOG_FUNC; + + /* TODO holy nested loops, Batman! */ + /* check for "recommended" package replacements */ + _alpm_log(PM_LOG_DEBUG, _("checking for package replacements")); + for(i = handle->dbs_sync; i; i = i->next) { + for(j = _alpm_db_get_pkgcache(i->data, INFRQ_DESC); j; j = j->next) { + pmpkg_t *spkg = j->data; + for(k = spkg->replaces; k; k = k->next) { + alpm_list_t *m; + for(m = _alpm_db_get_pkgcache(handle->db_local, INFRQ_NONE); m; m = m->next) { + pmpkg_t *lpkg = m->data; + if(strcmp(k->data, lpkg->name) == 0) { + _alpm_log(PM_LOG_DEBUG, _("checking replacement '%s' for package '%s'"), k->data, spkg->name); + if(alpm_list_find_str(handle->ignorepkg, lpkg->name)) { + _alpm_log(PM_LOG_WARNING, _("%s-%s: ignoring package upgrade (to be replaced by %s-%s)"), + lpkg->name, lpkg->version, spkg->name, spkg->version); + } else { + /* assume all replaces=() packages are accepted */ + pmsyncpkg_t *sync = NULL; + pmpkg_t *dummy = _alpm_pkg_new(lpkg->name, NULL); + if(dummy == NULL) { + pm_errno = PM_ERR_MEMORY; + goto error; + } + dummy->requiredby = alpm_list_strdup(lpkg->requiredby); + /* check if spkg->name is already in the packages list. */ + alpm_list_t *s; + for(s = syncpkgs; s && !found; s = s->next) { + sync = i->data; + if(sync && !strcmp(sync->pkg->name, spkg->name)) { + found = 1; + } + } + + if(found) { + /* found it -- just append to the replaces list */ + sync->data = alpm_list_add(sync->data, dummy); + } else { + /* none found -- enter pkg into the final sync list */ + sync = _alpm_sync_new(PM_SYNC_TYPE_REPLACE, spkg, NULL); + if(sync == NULL) { + FREEPKG(dummy); + pm_errno = PM_ERR_MEMORY; + goto error; + } + sync->data = alpm_list_add(NULL, dummy); + syncpkgs = alpm_list_add(syncpkgs, sync); + } + _alpm_log(PM_LOG_DEBUG, _("%s-%s elected for upgrade (to be replaced by %s-%s)"), + lpkg->name, lpkg->version, spkg->name, spkg->version); + } + break; + } + } + } + } + } + + /* now do normal upgrades */ + for(i = _alpm_db_get_pkgcache(handle->db_local, INFRQ_NONE); i; i = i->next) { + int cmp; + int replace=0; + pmpkg_t *local = i->data; + pmpkg_t *spkg = NULL; + pmsyncpkg_t *sync; + + for(j = handle->dbs_sync; !spkg && j; j = j->next) { + spkg = _alpm_db_get_pkgfromcache(j->data, local->name); + } + if(spkg == NULL) { + _alpm_log(PM_LOG_DEBUG, _("'%s' not found in sync db -- skipping"), local->name); + continue; + } + + /* we don't care about a to-be-replaced package's newer version */ + for(j = syncpkgs; j && !replace; j=j->next) { + sync = j->data; + if(sync->type == PM_SYNC_TYPE_REPLACE) { + if(_alpm_pkg_isin(spkg->name, sync->data)) { + replace=1; + } + } + } + if(replace) { + _alpm_log(PM_LOG_DEBUG, _("'%s' is already elected for removal -- skipping"), + local->name); + continue; + } + + /* compare versions and see if we need to upgrade */ + cmp = alpm_versioncmp(local->version, spkg->version); + if(cmp > 0 && !spkg->force) { + /* local version is newer */ + pmdb_t *db = spkg->data; + _alpm_log(PM_LOG_WARNING, _("%s: local (%s) is newer than %s (%s)"), + local->name, local->version, db->treename, spkg->version); + } else if(cmp == 0) { + /* versions are identical */ + } else if(alpm_list_find_str(handle->ignorepkg, spkg->name)) { + /* package should be ignored (IgnorePkg) */ + _alpm_log(PM_LOG_WARNING, _("%s-%s: ignoring package upgrade (%s)"), + local->name, local->version, spkg->version); + } else if(_alpm_pkg_istoonew(spkg)) { + /* package too new (UpgradeDelay) */ + _alpm_log(PM_LOG_DEBUG, _("%s-%s: delaying upgrade of package (%s)"), + local->name, local->version, spkg->version); + /* check if spkg->name is already in the packages list. */ + } else { + _alpm_log(PM_LOG_DEBUG, _("%s-%s elected for upgrade (%s => %s)"), + local->name, local->version, local->version, spkg->version); + alpm_list_t *s; + pmsyncpkg_t *sync = NULL; + found = 0; + for(s = syncpkgs; s && !found; s = s->next) { + sync = i->data; + if(sync && strcmp(sync->pkg->name, local->name) == 0) { + found = 1; + } + } + + if(!found) { + pmpkg_t *dummy = _alpm_pkg_new(local->name, local->version); + if(dummy == NULL) { + goto error; + } + sync = _alpm_sync_new(PM_SYNC_TYPE_UPGRADE, spkg, dummy); + if(sync == NULL) { + FREEPKG(dummy); + goto error; + } + syncpkgs = alpm_list_add(syncpkgs, sync); + } + } + } + + return(syncpkgs); +error: + if(syncpkgs) { + alpm_list_free_inner(syncpkgs, _alpm_sync_free); + alpm_list_free(syncpkgs); + } + return(NULL); +} + /* vim: set ts=2 sw=2 noet: */ Index: pacman-lib/lib/libalpm/alpm.h diff -u pacman-lib/lib/libalpm/alpm.h:1.70 pacman-lib/lib/libalpm/alpm.h:1.71 --- pacman-lib/lib/libalpm/alpm.h:1.70 Wed Jan 31 01:10:21 2007 +++ pacman-lib/lib/libalpm/alpm.h Sun Feb 4 03:26:52 2007 @@ -486,6 +486,8 @@ /* Version Compare */ int alpm_versioncmp(const char *a, const char *b); +alpm_list_t *alpm_get_upgrades(); + #ifdef __cplusplus } #endif Index: pacman-lib/lib/libalpm/package.c diff -u pacman-lib/lib/libalpm/package.c:1.56 pacman-lib/lib/libalpm/package.c:1.57 --- pacman-lib/lib/libalpm/package.c:1.56 Sat Feb 3 22:24:32 2007 +++ pacman-lib/lib/libalpm/package.c Sun Feb 4 03:26:52 2007 @@ -834,4 +834,15 @@ return pkg->scriptlet; } +int _alpm_pkg_istoonew(pmpkg_t *pkg) +{ + time_t t; + + ALPM_LOG_FUNC; + + if (!handle->upgradedelay) + return 0; + time(&t); + return((pkg->date + handle->upgradedelay) > t); +} /* vim: set ts=2 sw=2 noet: */ Index: pacman-lib/lib/libalpm/package.h diff -u pacman-lib/lib/libalpm/package.h:1.24 pacman-lib/lib/libalpm/package.h:1.25 --- pacman-lib/lib/libalpm/package.h:1.24 Tue Jan 23 22:02:54 2007 +++ pacman-lib/lib/libalpm/package.h Sun Feb 4 03:26:52 2007 @@ -97,7 +97,7 @@ pmpkg_t *_alpm_pkg_load(char *pkgfile); pmpkg_t *_alpm_pkg_isin(char *needle, alpm_list_t *haystack); int _alpm_pkg_splitname(char *target, char *name, char *version, int witharch); - +int _alpm_pkg_istoonew(pmpkg_t *pkg); #endif /* _ALPM_PACKAGE_H */ Index: pacman-lib/lib/libalpm/sync.c diff -u pacman-lib/lib/libalpm/sync.c:1.97 pacman-lib/lib/libalpm/sync.c:1.98 --- pacman-lib/lib/libalpm/sync.c:1.97 Wed Jan 31 22:31:46 2007 +++ pacman-lib/lib/libalpm/sync.c Sun Feb 4 03:26:52 2007 @@ -115,18 +115,6 @@ return(sync); } -static int istoonew(pmpkg_t *pkg) -{ - time_t t; - - ALPM_LOG_FUNC; - - if (!handle->upgradedelay) - return 0; - time(&t); - return((pkg->date + handle->upgradedelay) > t); -} - /* Find recommended replacements for packages during a sync. * (refactored from _alpm_sync_prepare) */ @@ -198,6 +186,7 @@ return(-1); } +/* TODO reimplement this in terms of alpm_get_upgrades */ int _alpm_sync_sysupgrade(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync) { alpm_list_t *i, *j; @@ -252,7 +241,7 @@ /* package should be ignored (IgnorePkg) */ _alpm_log(PM_LOG_WARNING, _("%s-%s: ignoring package upgrade (%s)"), local->name, local->version, spkg->version); - } else if(istoonew(spkg)) { + } else if(_alpm_pkg_istoonew(spkg)) { /* package too new (UpgradeDelay) */ _alpm_log(PM_LOG_DEBUG, _("%s-%s: delaying upgrade of package (%s)"), local->name, local->version, spkg->version); Index: pacman-lib/src/pacman/conf.h diff -u pacman-lib/src/pacman/conf.h:1.14 pacman-lib/src/pacman/conf.h:1.15 --- pacman-lib/src/pacman/conf.h:1.14 Wed Jan 31 01:10:22 2007 +++ pacman-lib/src/pacman/conf.h Sun Feb 4 03:26:53 2007 @@ -43,6 +43,7 @@ unsigned short op_q_owns; unsigned short op_q_search; unsigned short op_q_changelog; + unsigned short op_q_upgrade; unsigned short op_s_clean; unsigned short op_s_dependsonly; unsigned short op_s_downloadonly; Index: pacman-lib/src/pacman/pacman.c diff -u pacman-lib/src/pacman/pacman.c:1.86 pacman-lib/src/pacman/pacman.c:1.87 --- pacman-lib/src/pacman/pacman.c:1.86 Sat Feb 3 20:36:45 2007 +++ pacman-lib/src/pacman/pacman.c Sun Feb 4 03:26:53 2007 @@ -372,7 +372,7 @@ break; case 'u': config->op_s_upgrade = 1; - /* TODO config->op_q_upgrade = 1; */ + config->op_q_upgrade = 1; break; case 'v': (config->verbose)++; break; case 'w': Index: pacman-lib/src/pacman/query.c diff -u pacman-lib/src/pacman/query.c:1.21 pacman-lib/src/pacman/query.c:1.22 --- pacman-lib/src/pacman/query.c:1.21 Wed Jan 31 03:00:50 2007 +++ pacman-lib/src/pacman/query.c Sun Feb 4 03:26:53 2007 @@ -124,6 +124,19 @@ } } + if(config->op_q_upgrade) { + MSG(NL, _("Checking for package upgrades")); + alpm_list_t *syncpkgs; + + if((syncpkgs = alpm_get_upgrades()) != NULL) { + display_targets(syncpkgs); + return(0); + } else { + MSG(NL, _("no upgrades found")); + return(1); + } + } + for(i = targets; !done; i = (i ? alpm_list_next(i) : NULL)) { if(targets == NULL) { done = 1; Index: pacman-lib/src/pacman/util.c diff -u pacman-lib/src/pacman/util.c:1.26 pacman-lib/src/pacman/util.c:1.27 --- pacman-lib/src/pacman/util.c:1.26 Sat Feb 3 20:36:45 2007 +++ pacman-lib/src/pacman/util.c Sun Feb 4 03:26:53 2007 @@ -263,14 +263,14 @@ * `pkgs` should be a list of pmsyncpkg_t's, * retrieved from a transaction object */ -void display_targets(alpm_list_t *pkgs) +void display_targets(alpm_list_t *syncpkgs) { char *str; alpm_list_t *i, *j; alpm_list_t *targets = NULL, *to_remove = NULL; unsigned long totalsize = 0, totalisize = 0, totalrsize = 0; - for(i = pkgs; i; i = alpm_list_next(i)) { + for(i = syncpkgs; i; i = alpm_list_next(i)) { pmsyncpkg_t *sync = alpm_list_getdata(i); pmpkg_t *pkg = alpm_sync_get_package(sync); Index: pacman-lib/src/pacman/util.h diff -u pacman-lib/src/pacman/util.h:1.15 pacman-lib/src/pacman/util.h:1.16 --- pacman-lib/src/pacman/util.h:1.15 Sat Feb 3 20:36:45 2007 +++ pacman-lib/src/pacman/util.h Sun Feb 4 03:26:53 2007 @@ -59,7 +59,7 @@ char *strtrim(char *str); int reg_match(char *string, char *pattern); void list_display(const char *title, alpm_list_t *list); -void display_targets(alpm_list_t *pkgs); +void display_targets(alpm_list_t *syncpkgs); float get_update_timediff(int first_call); void fill_progress(const int percent, const int proglen);

1 0

[pacman-dev] CVS update of pacman-lib/src/pacman (6 files)
by Aaron Griffin 04 Feb '07

04 Feb '07

Date: Saturday, February 3, 2007 @ 20:36:45 Author: aaron Path: /home/cvs-pacman/pacman-lib/src/pacman Modified: downloadprog.c (1.8 -> 1.9) pacman.c (1.85 -> 1.86) sync.c (1.107 -> 1.108) trans.c (1.30 -> 1.31) util.c (1.25 -> 1.26) util.h (1.14 -> 1.15) * unified the progress bars (fill_progress function) * fixed progress output (needs an fflush to move cursor properly) * broke display_targets function out, to display a list of syncpkgs in preparation for a -Qu option * added get_update_time function to deal with progress functions that shouldn't update too fast due to output redraw speeds ----------------+ downloadprog.c | 89 +++++++----------------------- pacman.c | 6 +- sync.c | 54 ------------------ trans.c | 82 +++++++-------------------- util.c | 162 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ util.h | 6 ++ 6 files changed, 218 insertions(+), 181 deletions(-) Index: pacman-lib/src/pacman/downloadprog.c diff -u pacman-lib/src/pacman/downloadprog.c:1.8 pacman-lib/src/pacman/downloadprog.c:1.9 --- pacman-lib/src/pacman/downloadprog.c:1.8 Thu Jan 25 21:19:24 2007 +++ pacman-lib/src/pacman/downloadprog.c Sat Feb 3 20:36:45 2007 @@ -40,58 +40,57 @@ /* progress bar */ static float rate_last; static int xfered_last; -static struct timeval last_time; static struct timeval initial_time; /* pacman options */ extern config_t *config; -#define FILENAME_TRIM_LEN 21 -#define UPDATE_SPEED_SEC 0.1 +#define FILENAME_TRIM_LEN 23 void log_progress(const char *filename, int xfered, int total) { - static unsigned int lasthash = 0, mouth = 0; - unsigned int i, hash; - /* a little hard to conceal easter eggs in open-source software, - * but they're still fun. ;) */ - const unsigned short chomp = alpm_option_get_chomp(); + const int infolen = 50; char *fname, *p; - unsigned int maxcols = getcols(); - unsigned int progresslen = maxcols - 57; - int percent = (int)((float)xfered) / ((float)total) * 100; + struct timeval current_time; float rate = 0.0; unsigned int eta_h = 0, eta_m = 0, eta_s = 0; float total_timediff, timediff; + if(config->noprogressbar) { + return; + } + + int percent = (int)((float)xfered) / ((float)total) * 100; + if(xfered == 0) { set_output_padding(1); /* we need padding from pm_fprintf output */ gettimeofday(&initial_time, NULL); - gettimeofday(&last_time, NULL); xfered_last = 0; rate_last = 0.0; + timediff = get_update_timediff(1); + } else { + timediff = get_update_timediff(0); } - if(config->noprogressbar) { + if(percent > 0 && percent < 100 && !timediff) { + /* only update the progress bar when + * a) we first start + * b) we end the progress + * c) it has been long enough since the last call + */ return; } gettimeofday(&current_time, NULL); total_timediff = current_time.tv_sec-initial_time.tv_sec + (float)(current_time.tv_usec-initial_time.tv_usec) / 1000000; - timediff = current_time.tv_sec-last_time.tv_sec - + (float)(current_time.tv_usec-last_time.tv_usec) / 1000000; if(xfered == total) { /* compute final values */ rate = (float)total / (total_timediff * 1024); eta_s = (unsigned int)total_timediff; set_output_padding(0); /* shut off padding */ - } else if(timediff < UPDATE_SPEED_SEC) { - /* we avoid computing the ETA on too small periods of time, so that - results are more significant */ - return; } else { rate = (float)(xfered - xfered_last) / (timediff * 1024); rate = (float)(rate + 2*rate_last) / 3; @@ -99,7 +98,6 @@ } rate_last = rate; - last_time = current_time; xfered_last = xfered; /* fix up time for display */ @@ -116,61 +114,18 @@ fname[FILENAME_TRIM_LEN] = '\0'; } - /* hide the cursor i - prevent flicker - printf("\033[?25l\033[?1c"); - */ - - /* - * DL rate cap, for printf formatting - this should be sane for a while - * if anything we can change to MB/s if we need a higher rate - */ + /* DL rate cap, for printf formatting - this should be sane for a while + * if anything we can change to MB/s if we need a higher rate */ if(rate > 9999.9) { rate = 9999.9; } - printf(" %-*s %6dK %#6.1fK/s %02u:%02u:%02u [", FILENAME_TRIM_LEN, fname, + printf(" %-*s %6dK %#6.1fK/s %02u:%02u:%02u", FILENAME_TRIM_LEN, fname, xfered/1024, rate, eta_h, eta_m, eta_s); free(fname); - hash = (unsigned int)percent*progresslen/100; - for(i = progresslen; i > 0; --i) { - if(chomp) { - if(i > progresslen - hash) { - printf("-"); - } else if(i == progresslen - hash) { - if(lasthash == hash) { - if(mouth) { - printf("\033[1;33mC\033[m"); - } else { - printf("\033[1;33mc\033[m"); - } - } else { - lasthash = hash; - mouth = mouth == 1 ? 0 : 1; - if(mouth) { - printf("\033[1;33mC\033[m"); - } else { - printf("\033[1;33mc\033[m"); - } - } - } else if(i%3 == 0) { - printf("\033[0;37mo\033[m"); - } else { - printf("\033[0;37m \033[m"); - } - } else if(i > progresslen - hash) { - printf("#"); - } else { - printf("-"); - } - } - printf("] %3d%%\r", percent); - - if(percent == 100) { - printf("\n"); - } - fflush(stdout); + fill_progress(percent, getcols() - infolen); return; } Index: pacman-lib/src/pacman/pacman.c diff -u pacman-lib/src/pacman/pacman.c:1.85 pacman-lib/src/pacman/pacman.c:1.86 --- pacman-lib/src/pacman/pacman.c:1.85 Wed Jan 31 01:10:22 2007 +++ pacman-lib/src/pacman/pacman.c Sat Feb 3 20:36:45 2007 @@ -130,6 +130,7 @@ printf(_(" -o, --owns <file> query the package that owns <file>\n")); printf(_(" -p, --file query the package file [package] instead of the database\n")); printf(_(" -s, --search search locally-installed packages for matching strings\n")); + printf(_(" -u, --upgrades list all packages that can be upgraded\n")); } else if(op == PM_OP_SYNC) { printf(_("usage: %s {-S --sync} [options] [package]\n"), myname); printf(_("options:\n")); @@ -369,7 +370,10 @@ config->op_q_search = 1; config->flags |= PM_TRANS_FLAG_RECURSE; break; - case 'u': config->op_s_upgrade = 1; break; + case 'u': + config->op_s_upgrade = 1; + /* TODO config->op_q_upgrade = 1; */ + break; case 'v': (config->verbose)++; break; case 'w': config->op_s_downloadonly = 1; Index: pacman-lib/src/pacman/sync.c diff -u pacman-lib/src/pacman/sync.c:1.107 pacman-lib/src/pacman/sync.c:1.108 --- pacman-lib/src/pacman/sync.c:1.107 Sat Feb 3 02:29:51 2007 +++ pacman-lib/src/pacman/sync.c Sat Feb 3 20:36:45 2007 @@ -626,60 +626,8 @@ goto cleanup; } - /* list targets and get confirmation */ if(!(alpm_trans_get_flags() & PM_TRANS_FLAG_PRINTURIS)) { - alpm_list_t *list_install = NULL, *list_remove = NULL; - - char *str; - unsigned long totalsize = 0; - unsigned long totalisize = 0; - double mb, umb; - - for(i = packages; i; i = alpm_list_next(i)) { - pmsyncpkg_t *sync = alpm_list_getdata(i); - pmpkg_t *pkg = alpm_sync_get_package(sync); - const char *pkgname, *pkgver; - - if(alpm_sync_get_type(sync) == PM_SYNC_TYPE_REPLACE) { - alpm_list_t *data = alpm_sync_get_data(sync); - for(j = data; j; j = alpm_list_next(j)) { - pmpkg_t *p = alpm_list_getdata(j); - const char *pkgname = alpm_pkg_get_name(p); - if(!alpm_list_find_str(list_remove, pkgname)) { - list_remove = alpm_list_add(list_remove, strdup(pkgname)); - } - } - } - - pkgname = alpm_pkg_get_name(pkg); - pkgver = alpm_pkg_get_version(pkg); - totalsize += alpm_pkg_get_size(pkg); - totalisize += alpm_pkg_get_isize(pkg); - - asprintf(&str, "%s-%s", pkgname, pkgver); - list_install = alpm_list_add(list_install, str); - } - if(list_remove) { - MSG(NL, "\n"); /* TODO ugly hack. printing a single NL should be easy */ - list_display(_("Remove:"), list_remove); - FREELIST(list_remove); - } - mb = (double)(totalsize / 1048576.0); - umb = (double)(totalisize / 1048576.0); - /* round up to 0.1 */ - if(mb < 0.1) { - mb = 0.1; - } - if(umb > 0 && umb < 0.1) { - umb = 0.1; - } - MSG(NL, "\n"); - list_display(_("Targets:"), list_install); - MSG(NL, _("\nTotal Package Size: %.1f MB\n"), mb); - if(umb > 0) { - MSG(NL, _("Total Installed Size: %.1f MB\n"), umb); - } - FREELIST(list_install); + display_targets(packages); if(config->op_s_downloadonly) { if(config->noconfirm) { Index: pacman-lib/src/pacman/trans.c diff -u pacman-lib/src/pacman/trans.c:1.30 pacman-lib/src/pacman/trans.c:1.31 --- pacman-lib/src/pacman/trans.c:1.30 Tue Jan 30 20:37:41 2007 +++ pacman-lib/src/pacman/trans.c Sat Feb 3 20:36:45 2007 @@ -57,58 +57,6 @@ fputs(_("] 100% LOCAL "), stdout); } -/* refactored from cb_trans_progress */ -/* TODO with a little more work, we may be able to incorporate this - * into the download progress bar as well. */ -static void fill_progress(const int percent, const int proglen) -{ - const unsigned short chomp = alpm_option_get_chomp(); - const unsigned int hashlen = proglen - 8; - const unsigned int hash = percent * hashlen / 100; - unsigned int lasthash = 0, mouth = 0; - unsigned int i; - - printf(" ["); - for(i = hashlen; i > 1; --i) { - /* if special progress bar enabled */ - if(chomp) { - if(i > hashlen - hash) { - printf("-"); - } else if(i == hashlen - hash) { - if(lasthash == hash) { - if(mouth) { - printf("\033[1;33mC\033[m"); - } else { - printf("\033[1;33mc\033[m"); - } - } else { - lasthash = hash; - mouth = mouth == 1 ? 0 : 1; - if(mouth) { - printf("\033[1;33mC\033[m"); - } else { - printf("\033[1;33mc\033[m"); - } - } - } else if(i%3 == 0) { - printf("\033[0;37mo\033[m"); - } else { - printf("\033[0;37m \033[m"); - } - } /* else regular progress bar */ - else if(i > hashlen - hash) { - printf("#"); - } else { - printf("-"); - } - } - printf("] %3d%%\r", percent); - - if(percent == 100) { - printf("\n"); - } -} - /* Callback to handle transaction events */ void cb_trans_evt(pmtransevt_t event, void *data1, void *data2) @@ -347,9 +295,11 @@ void cb_trans_progress(pmtransprog_t event, char *pkgname, const int percent, const int howmany, const int remain) { + float timediff; + /* size of line to allocate for text printing (e.g. not progressbar) */ const int infolen = 50; - int i, digits, textlen, pkglen, proglen; + int i, digits, textlen, pkglen; char *ptr = NULL; if(config->noprogressbar) { @@ -358,12 +308,22 @@ if(percent == 0) { set_output_padding(1); /* turn on output padding with ' ' */ - } else if(percent == 100) { - set_output_padding(0); /* shut it off again */ + timediff = get_update_timediff(1); + } else { + timediff = get_update_timediff(0); + } + + if(percent > 0 && percent < 100 && !timediff) { + /* only update the progress bar when + * a) we first start + * b) we end the progress + * c) it has been long enough since the last call + */ + return; } /* if no pkgname, percent is too high or unchanged, then return */ - if (!pkgname || percent > 100 || percent == prevpercent) { + if(!pkgname || percent == prevpercent) { return; } @@ -403,17 +363,19 @@ printf("(%*d/%*d) %s %-*.*s", digits, remain, digits, howmany, ptr, pkglen, pkglen, pkgname); break; - case PM_TRANS_PROGRESS_CONFLICTS_START: printf("(%*d/%*d) %-*s", digits, remain, digits, howmany, textlen, ptr); break; - } /* call refactored fill progress function */ - proglen = getcols() - infolen; - fill_progress(percent, proglen); + fill_progress(percent, getcols() - infolen); + + if(percent >= 100) { + set_output_padding(0); /* restore padding */ + } + } /* vim: set ts=2 sw=2 noet: */ Index: pacman-lib/src/pacman/util.c diff -u pacman-lib/src/pacman/util.c:1.25 pacman-lib/src/pacman/util.c:1.26 --- pacman-lib/src/pacman/util.c:1.25 Thu Feb 1 01:35:30 2007 +++ pacman-lib/src/pacman/util.c Sat Feb 3 20:36:45 2007 @@ -26,6 +26,7 @@ #include <sys/types.h> #include <sys/ioctl.h> +#include <sys/time.h> #include "config.h" #include <stdio.h> @@ -258,4 +259,165 @@ } } +/* Display a list of transaction targets. + * `pkgs` should be a list of pmsyncpkg_t's, + * retrieved from a transaction object + */ +void display_targets(alpm_list_t *pkgs) +{ + char *str; + alpm_list_t *i, *j; + alpm_list_t *targets = NULL, *to_remove = NULL; + unsigned long totalsize = 0, totalisize = 0, totalrsize = 0; + + for(i = pkgs; i; i = alpm_list_next(i)) { + pmsyncpkg_t *sync = alpm_list_getdata(i); + pmpkg_t *pkg = alpm_sync_get_package(sync); + + /* If this sync record is a replacement, the data member contains + * a list of packages to be removed due to the package that is being + * installed. */ + if(alpm_sync_get_type(sync) == PM_SYNC_TYPE_REPLACE) { + alpm_list_t *to_replace = alpm_sync_get_data(sync); + + for(j = to_replace; j; j = alpm_list_next(j)) { + pmpkg_t *rp = alpm_list_getdata(j); + const char *name = alpm_pkg_get_name(rp); + + if(!alpm_list_find_str(to_remove, name)) { + totalrsize += alpm_pkg_get_isize(rp); + to_remove = alpm_list_add(to_remove, strdup(name)); + } + } + } + + totalsize += alpm_pkg_get_size(pkg); + totalisize += alpm_pkg_get_isize(pkg); + + asprintf(&str, "%s-%s", alpm_pkg_get_name(pkg), alpm_pkg_get_version(pkg)); + targets = alpm_list_add(targets, str); + } + + if(to_remove) { + MSG(NL, "\n"); /* TODO ugly hack. printing a single NL should be easy */ + list_display(_("Remove:"), to_remove); + FREELIST(to_remove); + + double rmb = (double)(totalrsize) / (1024.0 * 1024.0); + if(rmb > 0) { + if(rmb < 0.1) { + rmb = 0.1; + } + MSG(NL, _("\nTotal Removed Size: %.2f MB\n"), rmb); + } + } + + MSG(NL, "\n"); /* TODO ugly hack. printing a single NL should be easy */ + list_display(_("Targets:"), targets); + + double mb = (double)(totalsize) / (1024.0 * 1024.0); + if(mb < 0.1) { + mb = 0.1; + } + MSG(NL, _("\nTotal Package Size: %.2f MB\n"), mb); + + double umb = (double)(totalisize) / (1024.0 * 1024.0); + if(umb > 0) { + if(umb < 0.1) { + umb = 0.1; + } + MSG(NL, _("Total Installed Size: %.2f MB\n"), umb); + } + + FREELIST(targets); +} + +/* Silly little helper function, determines if the caller needs a visual update + * since the last time this function was called. + * This is made for the two progress bar functions, to prevent flicker + * + * first_call indicates if this is the first time it is called, for + * initialization purposes */ +float get_update_timediff(int first_call) +{ + float retval = 0.0; + static struct timeval last_time = {0}; + struct timeval this_time; + + if(first_call) { + /* always update on the first call */ + retval = 1.0; + } else { + gettimeofday(&this_time, NULL); + + float diff_sec = this_time.tv_sec - last_time.tv_sec; + float diff_usec = this_time.tv_usec - last_time.tv_usec; + + retval = diff_sec + (diff_usec / 1000000.0f); + /*printf("update time: %fs %fus = %f\n", diff_sec, diff_usec, retval);*/ + + if(retval < UPDATE_SPEED_SEC) { + /* maintain the last_time value for the next call */ + return(0.0); + } + } + + /* set the time for the next call */ + gettimeofday(&last_time, NULL); + + return(retval); +} + +/* refactored from cb_trans_progress */ +void fill_progress(const int percent, const int proglen) +{ + const unsigned short chomp = alpm_option_get_chomp(); + const unsigned int hashlen = proglen - 8; + const unsigned int hash = percent * hashlen / 100; + unsigned int lasthash = 0, mouth = 0; + unsigned int i; + + printf(" ["); + for(i = hashlen; i > 1; --i) { + /* if special progress bar enabled */ + if(chomp) { + if(i > hashlen - hash) { + printf("-"); + } else if(i == hashlen - hash) { + if(lasthash == hash) { + if(mouth) { + printf("\033[1;33mC\033[m"); + } else { + printf("\033[1;33mc\033[m"); + } + } else { + lasthash = hash; + mouth = mouth == 1 ? 0 : 1; + if(mouth) { + printf("\033[1;33mC\033[m"); + } else { + printf("\033[1;33mc\033[m"); + } + } + } else if(i%3 == 0) { + printf("\033[0;37mo\033[m"); + } else { + printf("\033[0;37m \033[m"); + } + } /* else regular progress bar */ + else if(i > hashlen - hash) { + printf("#"); + } else { + printf("-"); + } + } + printf("] %3d%%\r", percent); + + if(percent == 100) { + printf("\n"); + } + fflush(stdout); +} + + /* vim: set ts=2 sw=2 noet: */ Index: pacman-lib/src/pacman/util.h diff -u pacman-lib/src/pacman/util.h:1.14 pacman-lib/src/pacman/util.h:1.15 --- pacman-lib/src/pacman/util.h:1.14 Thu Feb 1 01:35:30 2007 +++ pacman-lib/src/pacman/util.h Sat Feb 3 20:36:45 2007 @@ -47,6 +47,9 @@ s1[(len)-1] = 0; \ } while(0) +/* update speed for the fill_progress based functions */ +#define UPDATE_SPEED_SEC 0.2f + #define _(str) gettext(str) unsigned int getcols(); int makepath(char *path); @@ -56,6 +59,9 @@ char *strtrim(char *str); int reg_match(char *string, char *pattern); void list_display(const char *title, alpm_list_t *list); +void display_targets(alpm_list_t *pkgs); +float get_update_timediff(int first_call); +void fill_progress(const int percent, const int proglen); #endif /* _PM_UTIL_H */

1 0

[pacman-dev] CVS update of pacman-lib/src/pacman (add.c sync.c)
by dan＠archlinux.org 03 Feb '07

03 Feb '07

Date: Saturday, February 3, 2007 @ 02:29:51 Author: dan Path: /home/cvs-pacman/pacman-lib/src/pacman Modified: add.c (1.28 -> 1.29) sync.c (1.106 -> 1.107) Add newlines to error messages --------+ add.c | 4 ++-- sync.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) Index: pacman-lib/src/pacman/add.c diff -u pacman-lib/src/pacman/add.c:1.28 pacman-lib/src/pacman/add.c:1.29 --- pacman-lib/src/pacman/add.c:1.28 Thu Feb 1 01:35:30 2007 +++ pacman-lib/src/pacman/add.c Sat Feb 3 02:29:51 2007 @@ -124,14 +124,14 @@ pmconflict_t *conflict = alpm_list_getdata(i); switch(alpm_conflict_get_type(conflict)) { case PM_CONFLICT_TYPE_TARGET: - MSG(NL, _("%s%s exists in \"%s\" (target) and \"%s\" (target)"), + MSG(NL, _("%s%s exists in \"%s\" (target) and \"%s\" (target)\n"), alpm_option_get_root(), alpm_conflict_get_file(conflict), alpm_conflict_get_target(conflict), alpm_conflict_get_ctarget(conflict)); break; case PM_CONFLICT_TYPE_FILE: - MSG(NL, _("%s: %s%s exists in filesystem"), + MSG(NL, _("%s: %s%s exists in filesystem\n"), alpm_conflict_get_target(conflict), alpm_option_get_root(), alpm_conflict_get_file(conflict)); Index: pacman-lib/src/pacman/sync.c diff -u pacman-lib/src/pacman/sync.c:1.106 pacman-lib/src/pacman/sync.c:1.107 --- pacman-lib/src/pacman/sync.c:1.106 Thu Feb 1 01:35:30 2007 +++ pacman-lib/src/pacman/sync.c Sat Feb 3 02:29:51 2007 @@ -718,14 +718,14 @@ pmconflict_t *conflict = alpm_list_getdata(i); switch(alpm_conflict_get_type(conflict)) { case PM_CONFLICT_TYPE_TARGET: - MSG(NL, _("%s%s exists in \"%s\" (target) and \"%s\" (target)"), + MSG(NL, _("%s%s exists in \"%s\" (target) and \"%s\" (target)\n"), alpm_option_get_root(), alpm_conflict_get_file(conflict), alpm_conflict_get_target(conflict), alpm_conflict_get_ctarget(conflict)); break; case PM_CONFLICT_TYPE_FILE: - MSG(NL, _("%s: %s%s exists in filesystem"), + MSG(NL, _("%s: %s%s exists in filesystem\n"), alpm_conflict_get_target(conflict), alpm_option_get_root(), alpm_conflict_get_file(conflict));

1 0

[pacman-dev] CVS update of pacman-lib/etc (makepkg.conf.in)
by dan＠archlinux.org 03 Feb '07

03 Feb '07

Date: Saturday, February 3, 2007 @ 00:23:27 Author: dan Path: /home/cvs-pacman/pacman-lib/etc Modified: makepkg.conf.in (1.8 -> 1.9) No longer necessary to explicitly specify SRCDEST, leave it up to user to decide. -----------------+ makepkg.conf.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: pacman-lib/etc/makepkg.conf.in diff -u pacman-lib/etc/makepkg.conf.in:1.8 pacman-lib/etc/makepkg.conf.in:1.9 --- pacman-lib/etc/makepkg.conf.in:1.8 Thu Dec 21 14:11:22 2006 +++ pacman-lib/etc/makepkg.conf.in Sat Feb 3 00:23:27 2007 @@ -68,6 +68,6 @@ #-- Destination: specify a fixed directory where all packages will be placed #PKGDEST=/home/packages #-- Source cache: specify a fixed directory where source files will be cached -SRCDEST=/var/cache/pacman/src +#SRCDEST=/var/cache/pacman/src #-- Packager: name/email of the person or organization building packages #PACKAGER="John Doe <john(a)doe.com>"

1 0

[pacman-dev] CVS update of pacman-lib/scripts (makepkg)
by dan＠archlinux.org 03 Feb '07

03 Feb '07

Date: Saturday, February 3, 2007 @ 00:21:55 Author: dan Path: /home/cvs-pacman/pacman-lib/scripts Modified: makepkg (1.40 -> 1.41) Fix problem with PKGDEST variable not being used correctly. ---------+ makepkg | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) Index: pacman-lib/scripts/makepkg diff -u pacman-lib/scripts/makepkg:1.40 pacman-lib/scripts/makepkg:1.41 --- pacman-lib/scripts/makepkg:1.40 Wed Jan 31 21:34:03 2007 +++ pacman-lib/scripts/makepkg Sat Feb 3 00:21:55 2007 @@ -314,9 +314,8 @@ ARGLIST=$@ #preserve environment variables -PKGDEST=${PKGDEST:-$startdir} #default to $startdir if undefined _PKGDEST=${PKGDEST} -_SRCDEST=$SRCDEST +_SRCDEST=${SRCDEST} #Source makepkg.conf; fail if it is not found if [ -f /etc/makepkg.conf ]; then @@ -333,7 +332,9 @@ # override settings with an environment variable for batch processing PKGDEST=${_PKGDEST:-$PKGDEST} +PKGDEST=${PKGDEST:-$startdir} #default to $startdir if undefined SRCDEST=${_SRCDEST:-$SRCDEST} +SRCDEST=${SRCDEST:-$startdir} #default to $startdir if undefined while [ "$#" -ne "0" ]; do case $1 in

1 0

[pacman-dev] pacman3 pkgrel 8 errors
by Callan Barrett 03 Feb '07

03 Feb '07

Ok so aside from some known bugs pkrel 7 for pacman3 was working a treat, but today I installed 8 and I don't know... all hell broke loose on my system. To start out I get this error constantly: error: /var/lib/pacman/local/pacman-rc-3.0.0-7/desc: No such file or directory makepkg and pacman (note I had pacman3 and makepkg3 aliased to pacman and makepkg) version 3 and 2 both spit out these errors, v2 moreso than v3. Some examples are: pacman -Syu ... all goes fine ... resolving dependencies... error: could not open file /var/lib/pacman/local/pacman-rc-3.0.0-7/desc: No such file or directory done. and pacman goes through fine, non-fatal. I tried to downgrade back to rel 7 which also errored on me with (I assume) a list of every single file in the pacman-rc package conflicting with itself, I had to use -Uf to downgrade. This happens everytime I try to downgrade but not at all with I upgrade. I also try to just reinstall the pacman-rc rel 8 package with pacman2 to see what would happen with: sudo /usr/bin/pacman -U pacman-rc-3.0.0-8-i686.pkg.tar.gz This literally spits out the first error hundreds and hundreds of times and then finally dies when it gets to checking for file conflicts. "pacman -Qi pacman-rc" also replaces every piece of information with the first error and appends an extra onto the end. The one on the end appears regardless of what package I query. Long story short that same errors seems to replace or append itself to every piece of output that comes out of either pacman version and the file contents of the latest pacman-rc package doesn't want to register in the db. The second one is about makepkg. As with pacman I get that no such file error a few times but nothing really fatal. On the PKGBUILD I tried (for comix in community) pacman3 refuses to admit "pil" is installed on my system even though it is but pacman2 goes through with it fine, I can't find any way around this aside from using makepkg2. Also I figure I'll mention this: mkdir: cannot create directory `/var/cache/pacman/src': Permission denied when running makepkg. I don't know if this is a feature or something because it comes with a formatted error message too but maybe someone can clear that up as well. Anyway I just thought I'd mention what happened to my system since rel 8. If it's an error with my system or an error with pacman I'd really like to know either way.

2 1

[pacman-dev] CVS update of pacman-lib (NEWS)
by dan＠archlinux.org 03 Feb '07

03 Feb '07

Date: Friday, February 2, 2007 @ 22:46:06 Author: dan Path: /home/cvs-pacman/pacman-lib Modified: NEWS (1.5 -> 1.6) Updated news file to be more relevant with previous release of pacman; ommitted many of the bugfixes in 'unreleased' versions, at least on the Arch Linux end. ------+ NEWS | 231 ++++++++--------------------------------------------------------- 1 file changed, 29 insertions(+), 202 deletions(-) Index: pacman-lib/NEWS diff -u pacman-lib/NEWS:1.5 pacman-lib/NEWS:1.6 --- pacman-lib/NEWS:1.5 Wed Nov 15 03:02:43 2006 +++ pacman-lib/NEWS Fri Feb 2 22:46:06 2007 @@ -1,207 +1,33 @@ VERSION DESCRIPTION ----------------------------------------------------------------------------- -3.0.0 - TODO this needs alot of work - - switched to libfetch in place of libftp - - attempt to speed up file reading by reading /desc and /depends - on demand - - bugfix for holdpkgs during an upgrade - - fix building with --enable-debug - - fixed the download progressbar - - -Ss works again for multiple repos - - bugfix for -Sp - - downloads are interruptable again - - new libalpm function: alpm_db_search() - - pactest: initial import, run make check to call it - - new libalpm function: alpm_parse_config() - - new libalpm function: alpm_fetch_pkgurl() - - implemented the progressbar for pacman -R - - the package name is now properly displayed in the progressbar - during install/upgrade - - updatesync: bugfix when deleting packages from the repo - - create /tmp before locking the database, useful when -r is used - in an empty dir - - makepkg: recoginze .TGZ, .ZIP and other uppercase extensions - - python: added a few casting functions - - ported libalpm to Solaris/Sparc - - bugfixes in the Hungarian translation - - bugfix for pacman -Qi -p - - new function in libalpm: alpm_db_setserver() - - incremented libalpm's sover due to new error codes intruduced - by alpm_db_setserver() - - added python bindings - - fixed a stale lockfile problem (when packages were corrupted) - - fixed problem when sometimes ^C was ignored - - new pacman option: --ask - - libalpm: prefixed all internal functions with _alpm - - makepkg: bugfix for suboptions=('nostrip') - - new package property: "build type" - it can be "chroot" or - custom - - updated Hungarian translation - - the old extra repo is now merged to the frugalware one - - handle the case properly when the user hits ^C during a - package install - - fix the output of scriptlet messages - - check if enough free space if available - - pipe and parse scriptlet messages. see man FrugalBuild - - new mirror: ftp10 - - udatesync: use bzip2 instead of gzip for package databases - - update/gensync: bugfix for the pkgdesc_localized directive - - Hungarian translation update - - fixed several compilation warning - - ia64 support - - manpage split: moved the FrugalBuild specific part from - man makepkg to man FrugalBuild - - minor bugfixes in makepkg - - gettext improvements - - French translation - - makepkg support and documentation for pkgdesc localization - - pacman: display uncompressed package size by default on upgrade - - initial support for pkgdesc localization - - bugfix for -Qi and -Qm - - fix -Sg for multiple repos - - drop the NoUpgrade lines from the default config - - makepkg: when removing the pkg dir, remove the subpkgs' pkg - dir, too - - significant speedup while sorting dependencies with libalpm - - fixes for pacman's -r option in pacman and libalpm - - initial support for uncompressed package sizes in a sync repo - - minor fixes for de_DE, hu_HU and tr_TR - - seems that the original pacman3's release is delayed so it's - no good in waiting for it. changed the versioning scheme to - our usual x.y.z - - i18n fixes: - in the german translation - in makepkg - - gpg support in makepkg -2.8.99.28 - added gettext support - - added German and Hungarian translation for libalpm and pacman -2.9.99.27 - scripts: cleanup, they now require util.sh from FST - - makepkg: handle spaces in source filenames - - makepkg: spelling fixes - - libalpm: fixed a few messages' verbosity level - - ./autogen.sh --dist now allows to build a snapshot fpm -2.9.99.26 - makepkg: new option -t (to be used with -R) - - added i386, OpenBSD and OS X support - - updated mirror list - - spelling fixes - - bugfix in pacman (dbpath initialization) -2.9.99.25 - bugfix in the conflicts/provides handling code - - spelling fix in makepkg - - include the root string (ie. a slash) in file conflict error - messages - - gensync: bugfix for subpkgs -2.9.99.24 - fixed the location of the locally installed packages' - install/changelog file (so that pre/post_remove and -Qc works - perfectly again) - - allow repo names to be longer than 128 chars - - fixed pacman -v output (not a bug just it was ugly) -2.9.99.23 - bugfix for -Sy - - gensync: ignore _darcs/ directories -2.9.99.22 - new feature: options=('scriptlet') to force executing the - install scriptlets even if one builds in a chroot - - makepkg -RC now uses the chroot's pacman.conf to determine - what packages need to be removed. this is especially useful - if you use unofficial repos only in chroot - - the testsuite is replaced by pactest, see HACKING -2.9.99.21 - bugfix release -2.9.99.20 - handle --noprogress on install/upgrade, too - - disable progressbar by default if the output is redirected - - offer deleting a packages if it is corrupted - - makepkg: install subpackages with -i, too - in chroot sync /etc/pacman.d/* from the host system - use the chroot's pacman.conf when it's available - - new pacman option: --noscriptlet for disabling install - scriptlets - - new variable in makepkg: $FCC in case the package would use - gcc directly (not from $PATH) -2.9.99.19 - more verbose error messages on corrupted packages - - makepkg: added support for clearing the cache of ccache - slice warnings for LANG!=C - - gen/updatesync: bugfix for subdescs() and subarchs() - no longer ignore the Finclude function call -2.9.99.18 - makepkg now allows to inherit install scriptlets from a - scheme - - allow multiple packages to be installed at once with -U - - added SBU variable to makepkg.conf - - 3 major bugfixes from upstream -2.9.99.17 - support for having subpkgs in an other repo. this affects - gensync and updatesync, also makepkg's manpage is updated - - support for handle version comparators in makepkg - - bugfix for Finclude in makepkg - - removed exit() calls from libalpm - - bugfix for nobuild packages in sync -2.9.99.16 - fixed a possible infinite loop during -S - - remove stale lockfile when pacman is interrupted - - new directive: added suboptions() and subarchs() for - FrugalBuilds - - added 'nofakeroot' to options() - - new makepkg witch: -RCC, now -RC only cleans the chroot -2.9.99.15 - fix 'error: transaction already initialized' when using -D -2.9.99.14 - documentation: improved libalpm manpages an added a main - libalpm(3) manpage - - yet another bugfix for the install/upgrade progressbar - - remove stale lockfile after -R/-A - - fixed a segfault when removing a package that is reqired by - other packages -2.9.99.13 - Allow queries (-Q, -Si, etc) during an other pacman is - running (ie. -Syu) - - Two bugfixes in connection with provides - - Improved makepkg output for subpackages (crazy) -2.9.99.12 - fixed preparing docs, 2.9.99.11 always supposed we want to - disable that feature -2.9.99.11 - fixed progressbar when installing and upgrading packages at - the same time - - in general, modified makeworld to work properly on Frugalware - - makepkg: if build fails, save the buildlog when using -R - - sudo improvements for makepkg & makeworld - - display "checking for conflicting files..." during -S - - initial doxygen support -2.9.99.10 - fixed -Sg output - now frugalpkg works again - - fixed a double free() when installing conflicting packages - - fixed an annoying bug with progressbar, now works as it did - in the pacman 2.x times - - don't care about a to-be-replaced package's newer version -2.9.99.9 - fixed -S/-U/-A segfault. hopefully not everybody upgraded - yet... -2.9.99.8 - if you have foo installed, and bar replaces + provides foo, - then remove foo, and install bar (now works again) - - upgrade only pacman first during a -Su - - removed duplicated error messages - - more verbose error message for conflicting files when using - -S -2.9.99.7 - bugfix for -Sg - - if pacman can't create its cachedir, then use /tmp (bugfix) -2.9.99.6 - bugfix for -Rs - - pre_install/pre_upgrade scripts are working again - - added a -f option to gensync/updatesync (don't die if the fpm - is missing) - - bugfix for --ignore - - added ppc support (to configure) - - handle broken databases (just print an error message, don't - segfault) - - more verbose error messages for unsatisfied dependencies -2.9.99.5 - re-added SBU support to makepkg (which was accidently dropped - by 2.9.99.0) - - initial package splitting support - - memleak fixes - - more verbose error messages on file conflicts -2.9.99.4 - fixed running scriptlets when -r is used - - don't die on up to date databases (when you do -Sy twice) - - more verbose error messages (ie. when there is a missing - dependency) -2.9.99.3 - fixed -v option - - allow c++ usage in alpm.h - - fixed logging everything twice to pacman.log -2.9.99.2 - makepkg -R works again if you haven't had a chroot yet (was a - pacman bug) - - output fix for -Sy - - if you have installed foo, and then you do a -S bar, then now - pacman offers you to remove foo (as it should) -2.9.99.1 - fix makepkg -g - - makepkg: fixed changelog generation - - fixed --noconfirm -2.9.99.0 - this is the first release which is based on pacman-lib - (converted the initial cvs repo to darcs) +3.0.0 - first release based on libalpm backend + - added internationalization (gettext) support + - prompt to delete corrupted packages + - **TODO** documentation - multiple man pages updated + - added support for package changelogs + - logging of all install scriptlet messages to pacman.log + - repository mirror list updates + - orphans search (-Qe) now shows true orphans + - dependency sorting on install and removal + - new uncompressed size field, shown on sync upgrade + - check for free space before installing packages + - improved progress and progressbar output + - reduced unnecessary calling of ldconfig + - selective loading of database to speed up certain operations + - switch to usage of libdownload and libarchive + - debugging output improved with --debug flag + - added 'rankmirrors' - script to show best available mirrors + - added 'repo-add' - the backbone script for building repos + - added pactest testing suite + - abs - supports cvsup/csup, expanded configuration + - makepkg fixes: + - support alternate integrity checks + - extract files using filetype, not extension + - added noextract array + - added option to log build process + - added repackage option - repackage pkg/ w/o building + - configurable source cache location + - pacman-optimize - support DB's on separate filesystem 2.9.8 - Changed behaviour with original=X,current=Y,new=Z scenario - keep old in place, install new as .pacnew - Search package provides when finding matching targets with -S @@ -508,3 +334,4 @@ - Changed db_find_conflicts() to ignore directories 1.0 - Initial Release +vim: set et:

1 0

[pacman-dev] CVS update of pacman-lib/etc/pacman.d (Makefile.am)
by Juergen Hoetzel 01 Feb '07

01 Feb '07

Date: Thursday, February 1, 2007 @ 16:46:08 Author: juergen Path: /home/cvs-pacman/pacman-lib/etc/pacman.d Modified: Makefile.am (1.5 -> 1.6) * fixed clean target: no error if repository files do not exist -------------+ Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: pacman-lib/etc/pacman.d/Makefile.am diff -u pacman-lib/etc/pacman.d/Makefile.am:1.5 pacman-lib/etc/pacman.d/Makefile.am:1.6 --- pacman-lib/etc/pacman.d/Makefile.am:1.5 Mon Jan 29 17:18:31 2007 +++ pacman-lib/etc/pacman.d/Makefile.am Thu Feb 1 16:46:08 2007 @@ -5,5 +5,5 @@ sed "s|@@REPO@@|$@|g" <$< >$@ clean: - rm $(dist_pkgsysconf_DATA) + rm -f $(dist_pkgsysconf_DATA)

1 0

[pacman-dev] CVS update of pacman-lib (configure.ac)
by Juergen Hoetzel 01 Feb '07

01 Feb '07

Date: Thursday, February 1, 2007 @ 14:50:08 Author: juergen Path: /home/cvs-pacman/pacman-lib Modified: configure.ac (1.27 -> 1.28) * removal of swig generated bindings --------------+ configure.ac | 3 --- 1 file changed, 3 deletions(-) Index: pacman-lib/configure.ac diff -u pacman-lib/configure.ac:1.27 pacman-lib/configure.ac:1.28 --- pacman-lib/configure.ac:1.27 Thu Feb 1 14:47:39 2007 +++ pacman-lib/configure.ac Thu Feb 1 14:50:07 2007 @@ -276,9 +276,6 @@ etc/pacman.d/Makefile etc/pacman.d/mirrorlist etc/abs/Makefile -bindings/perl/Makefile -bindings/python/Makefile -bindings/java/Makefile Makefile ])

1 0

[pacman-dev] CVS update of pacman-lib (9 files)
by Juergen Hoetzel 01 Feb '07

01 Feb '07

Date: Thursday, February 1, 2007 @ 14:47:40 Author: juergen Path: /home/cvs-pacman/pacman-lib Modified: Makefile.am (1.8 -> 1.9) configure.ac (1.26 -> 1.27) Removed: bindings/alpm.i (1.4) bindings/java/.cvsignore (1.1) bindings/java/Makefile.in (1.3) bindings/perl/.cvsignore (1.1) bindings/perl/Makefile.in (1.3) bindings/python/.cvsignore (1.1) bindings/python/Makefile.in (1.4) * removal of swig generated bindings -----------------------------+ Makefile.am | 10 ----- bindings/alpm.i | 23 ------------ bindings/java/.cvsignore | 5 -- bindings/java/Makefile.in | 48 ------------------------- bindings/perl/.cvsignore | 5 -- bindings/perl/Makefile.in | 42 ---------------------- bindings/python/.cvsignore | 6 --- bindings/python/Makefile.in | 49 -------------------------- configure.ac | 79 ------------------------------------------ 9 files changed, 267 deletions(-) Index: pacman-lib/Makefile.am diff -u pacman-lib/Makefile.am:1.8 pacman-lib/Makefile.am:1.9 --- pacman-lib/Makefile.am:1.8 Tue Nov 14 02:58:42 2006 +++ pacman-lib/Makefile.am Thu Feb 1 14:47:39 2007 @@ -1,15 +1,5 @@ SUBDIRS = lib/libalpm src/util src/pacman scripts doc doc/hu etc -if HAS_PERL -SUBDIRS += bindings/perl -endif -if HAS_PYTHON -SUBDIRS += bindings/python -endif -if HAS_JAVA -SUBDIRS += bindings/java -endif - EXTRA_DIST = \ ChangeLog \ COPYING \ Index: pacman-lib/bindings/alpm.i diff -u pacman-lib/bindings/alpm.i:1.4 pacman-lib/bindings/alpm.i:removed --- pacman-lib/bindings/alpm.i:1.4 Fri Jan 19 04:28:44 2007 +++ pacman-lib/bindings/alpm.i Thu Feb 1 14:47:41 2007 @@ -1,23 +0,0 @@ -#if defined(SWIGPERL) -%module "Alpm::Core" -#else -%module alpm -#endif -%include "cpointer.i" - -/* Wrap a class interface around a "long *" */ -%pointer_class(long, longp); - -/* Create casting functions */ - -%pointer_cast(void *, long *, void_to_long); -%pointer_cast(void *, char *, void_to_char); -%pointer_cast(void *, unsigned long, void_to_unsigned_long); -%pointer_cast(void *, alpm_list_t *, void_to_pmlist); -%pointer_cast(void *, pmpkg_t *, void_to_pmpkg); -%pointer_cast(void *, pmgrp_t *, void_to_pmgrp); -%pointer_cast(void *, pmsyncpkg_t *, void_to_pmsyncpkg); -%pointer_cast(void *, pmdb_t *, void_to_pmdb); -%pointer_cast(void *, pmconflict_t *, void_to_pmconflict); - -%include "alpm.h" Index: pacman-lib/bindings/java/.cvsignore diff -u pacman-lib/bindings/java/.cvsignore:1.1 pacman-lib/bindings/java/.cvsignore:removed --- pacman-lib/bindings/java/.cvsignore:1.1 Tue Jan 16 22:40:08 2007 +++ pacman-lib/bindings/java/.cvsignore Thu Feb 1 14:47:41 2007 @@ -1,5 +0,0 @@ -Makefile -*.class -*.java -alpm.i -*alpm* Index: pacman-lib/bindings/java/Makefile.in diff -u pacman-lib/bindings/java/Makefile.in:1.3 pacman-lib/bindings/java/Makefile.in:removed --- pacman-lib/bindings/java/Makefile.in:1.3 Wed Oct 25 11:40:44 2006 +++ pacman-lib/bindings/java/Makefile.in Thu Feb 1 14:47:41 2007 @@ -1,48 +0,0 @@ -top_srcdir = @top_srcdir@ -prefix = @prefix@ - -CFLAGS = $(subst -Werror,,@CFLAGS@) -I$(JAVA_HOME)/include/ -I$(JAVA_HOME)/include/linux/ -CFLAGS += -fno-strict-aliasing # see the swig docs -ifeq ($(shell arch),x86_64) -CFLAGS += -fPIC -endif -LDFLAGS += -L$(top_srcdir)/lib/libalpm/.libs -lalpm - -all: libalpm_java.so alpm.jar - -libalpm_java.so: alpm_java_wrap.o - $(CC) -shared $^ -o $@ $(LDFLAGS) - -alpm_java_wrap.o: alpm_java_wrap.c - $(CC) $(CFLAGS) -c -o $@ -include alpm.h $^ - -alpm_java_wrap.c: - cp $(top_srcdir)/lib/libalpm/alpm.h ./ - cp $(top_srcdir)/bindings/alpm.i alpm_java.i - swig -java alpm_java.i - -alpm.class: alpm.java - javac *.java - -alpm.jar: alpm.class - jar -cf alpm.jar *.class - -alpm.java: alpm_java_wrap.c - -install: install-so install-jar - -install-so: libalpm_java.so - mkdir -p $(DESTDIR)$(prefix)/lib - install $^ $(DESTDIR)$(prefix)/lib - -install-jar: alpm.jar - mkdir -p $(DESTDIR)$(prefix)/share/java - install -m644 $^ $(DESTDIR)$(prefix)/share/java - -clean: - rm -f *alpm* *.java *.class - -distclean: clean - rm -f Makefile - -check: Index: pacman-lib/bindings/perl/.cvsignore diff -u pacman-lib/bindings/perl/.cvsignore:1.1 pacman-lib/bindings/perl/.cvsignore:removed --- pacman-lib/bindings/perl/.cvsignore:1.1 Tue Jan 16 22:40:08 2007 +++ pacman-lib/bindings/perl/.cvsignore Thu Feb 1 14:47:41 2007 @@ -1,5 +0,0 @@ -Makefile -Core* -alpm.i -alpm.h -alpm_wrap* Index: pacman-lib/bindings/perl/Makefile.in diff -u pacman-lib/bindings/perl/Makefile.in:1.3 pacman-lib/bindings/perl/Makefile.in:removed --- pacman-lib/bindings/perl/Makefile.in:1.3 Thu Jan 18 11:52:57 2007 +++ pacman-lib/bindings/perl/Makefile.in Thu Feb 1 14:47:41 2007 @@ -1,42 +0,0 @@ -top_srcdir = @top_srcdir@ -prefix = @prefix@ - -CFLAGS = $(subst -Werror,,@CFLAGS@) -CFLAGS += $(shell perl -MExtUtils::Embed -e ccopts) -CFLAGS += -I$(top_srcdir)/lib/libalpm -ifeq ($(shell arch),x86_64) -CFLAGS += -fPIC -endif -LDFLAGS += -L$(top_srcdir)/lib/libalpm/.libs -lalpm -LIBDIR += $(shell perl -V|grep site|sed 's/^ *//;s|/usr|$(prefix)|;q') - -all: Core.so - -Core.so: alpm_wrap.o - $(CC) -shared -Wl,-soname,$@ -o $@ $^ $(LDFLAGS) - -alpm_wrap.o: alpm_wrap.c - $(CC) $(CFLAGS) -c -o $@ -include alpm.h $^ - -alpm_wrap.c: - cp $(top_srcdir)/lib/libalpm/alpm.h ./ - cp $(top_srcdir)/bindings/alpm.i ./ - swig -perl alpm.i - -install: install-so install-pm - -install-so: Core.so - mkdir -p $(DESTDIR)$(LIBDIR)/auto/Alpm/Core - install $^ $(DESTDIR)$(LIBDIR)/auto/Alpm/Core/ - -install-pm: Core.pm - mkdir -p $(DESTDIR)$(LIBDIR)/Alpm/ - install -m644 $^ $(DESTDIR)$(LIBDIR)/Alpm/ - -clean: - rm -f Core* alpm{.h,.i,_wrap*} - -distclean: clean - rm -f Makefile - -check: Index: pacman-lib/bindings/python/.cvsignore diff -u pacman-lib/bindings/python/.cvsignore:1.1 pacman-lib/bindings/python/.cvsignore:removed --- pacman-lib/bindings/python/.cvsignore:1.1 Tue Jan 16 22:40:08 2007 +++ pacman-lib/bindings/python/.cvsignore Thu Feb 1 14:47:41 2007 @@ -1,6 +0,0 @@ -Makefile -_alpm* -alpm.i -alpm.h -alpm.py* -alpm_wrap* Index: pacman-lib/bindings/python/Makefile.in diff -u pacman-lib/bindings/python/Makefile.in:1.4 pacman-lib/bindings/python/Makefile.in:removed --- pacman-lib/bindings/python/Makefile.in:1.4 Thu Jan 18 11:52:57 2007 +++ pacman-lib/bindings/python/Makefile.in Thu Feb 1 14:47:41 2007 @@ -1,49 +0,0 @@ -top_srcdir = @top_srcdir@ -prefix = @prefix@ - -CFLAGS = $(subst -Werror,,@CFLAGS@) -CFLAGS += $(shell python -c 'from distutils import sysconfig; print "-I" + sysconfig.get_python_inc()') -CFLAGS += -I$(top_srcdir)/lib/libalpm -CFLAGS += -fno-strict-aliasing # see the swig docs -ifeq ($(shell arch),x86_64) -CFLAGS += -fPIC -endif -LDFLAGS += -L$(top_srcdir)/lib/libalpm/.libs -lalpm -LIBDIR += $(shell python -c 'from distutils import sysconfig; print sysconfig.get_python_lib()'|sed 's|/usr|$(prefix)|') - -all: _alpm.so alpm.pyc - -_alpm.so: alpm_wrap.o - $(CC) -shared -Wl,-soname,$@ -o $@ $^ $(LDFLAGS) - -alpm_wrap.o: alpm_wrap.c - $(CC) $(CFLAGS) -c -o $@ -include alpm.h $^ - -alpm_wrap.c: - cp $(top_srcdir)/lib/libalpm/alpm.h ./ - cp $(top_srcdir)/bindings/alpm.i ./ - swig -python alpm.i - # strip the unnecessary prefixes - sed -i 's/^alpm_//;s/^PM_//' alpm.py - -alpm.pyc: alpm.py - python -c "import compileall; compileall.compile_dir('.',1,'.')" - -alpm.py: alpm_wrap.c - -install: install-so install-py - -install-so: _alpm.so - mkdir -p $(DESTDIR)$(LIBDIR) - install $^ $(DESTDIR)$(LIBDIR) - -install-py: alpm.py alpm.pyc - install -m644 $^ $(DESTDIR)$(LIBDIR) - -clean: - rm -f _alpm* alpm{.h,.i,.py*,_wrap*} - -distclean: clean - rm -f Makefile - -check: Index: pacman-lib/configure.ac diff -u pacman-lib/configure.ac:1.26 pacman-lib/configure.ac:1.27 --- pacman-lib/configure.ac:1.26 Tue Jan 30 15:37:59 2007 +++ pacman-lib/configure.ac Thu Feb 1 14:47:39 2007 @@ -207,82 +207,6 @@ fi AM_CONDITIONAL(HAS_DOXYGEN, test $DOXYGEN) -dnl Check for swig binary -AC_CHECK_PROGS([SWIG], [swig]) - -dnl Check for python support -AC_MSG_CHECKING(if Python bindings should be generated) -if test x$wantpython = xyes ; then - AM_CONDITIONAL(HAS_PYTHON, test $SWIG) - if test $SWIG ; then - AC_DEFINE([HAS_PYTHON], [TRUE], [Enabled Python Support]) - AC_MSG_RESULT(yes) - PYTHONSTATUS="yes, path: `which $SWIG`" - else - AC_DEFINE([HAS_PYTHON], [FALSE], [Disabled Python support]) - AC_MSG_RESULT(no, swig missing) - PYTHONSTATUS="swig binary not found" - fi -else - AM_CONDITIONAL(HAS_PYTHON, test $PYTHON) - AC_DEFINE([HAS_PYTHON], [FALSE], [Not specified at configure line]) - AC_MSG_RESULT(not requested by configure) - PYTHONSTATUS="no, disabled by configure" -fi - -dnl Check for perl support -AC_MSG_CHECKING(if Perl bindings should be generated) -if test x$wantperl = xyes ; then - AM_CONDITIONAL(HAS_PERL, test $SWIG) - if test $SWIG ; then - AC_DEFINE([HAS_PERL], [TRUE], [Enabled Perl Support]) - AC_MSG_RESULT(yes) - PERLSTATUS="yes, path: `which $SWIG`" - else - AC_DEFINE([HAS_PERL], [FALSE], [Disabled Perl support]) - AC_MSG_RESULT(no, swig missing) - PERLSTATUS="swig binary not found" - fi -else - AM_CONDITIONAL(HAS_PERL, test $PERL) - AC_DEFINE([HAS_PERL], [FALSE], [Not specified at configure line]) - AC_MSG_RESULT(not requested by configure) - PERLSTATUS="no, disabled by configure" -fi - -dnl Check for java support -AC_MSG_CHECKING(if Java bindings should be generated) -if test x$wantjava = xyes ; then - AC_CHECK_PROGS([JAVAC], [javac]) - AM_CONDITIONAL(HAS_JAVA, test "$JAVAC" -a "$SWIG") - if test $JAVAC ; then - if test $SWIG ; then - AC_DEFINE([HAS_JAVA], [TRUE], [Enabled Java Support (javac=ok swig=ok)]) - AC_MSG_RESULT(yes) - JAVASTATUS="yes, path: `which $JAVAC`" - else - AC_DEFINE([HAS_JAVA], [FALSE], [Java support disabled because swig not found (javac=ok swig=missing)]) - AC_MSG_RESULT(no, swig not found and that is need for java) - JAVASTATUS="java compiler found, swig not found" - fi - else - if test $SWIG ; then - AC_DEFINE([HAS_JAVA], [FALSE], [Disabled Java support (javac=missing swig=ok]) - AC_MSG_RESULT(no, javac missing, swig ok) - JAVASTATUS="java compiler not found, swig found" - else - AC_DEFINE([HAS_JAVA], [FALSE], [Disabled Java support (javac=missing swig=missing]) - AC_MSG_RESULT(no, javac missing, swig missing) - JAVASTATUS="java compiler not found, swig not found" - fi - fi -else - AM_CONDITIONAL(HAS_JAVA, test $JAVAC -a $SWIG) - AC_DEFINE([HAS_JAVA], [FALSE], [Not specified at configure line]) - AC_MSG_RESULT(not requested by configure) - JAVASTATUS="no, disabled by configure" -fi - dnl Check for math AC_CHECK_LIB([m], [sqrt], [AC_CHECK_HEADER([math.h], [LIBM='-lm'])]) if test -z "$LIBM"; then @@ -375,9 +299,6 @@ Doxygen support : ${DOXYSTATUS} Manpage localization : ${POSTATUS} - Perl bindings : ${PERLSTATUS} - Python bindings : ${PYTHONSTATUS} - Java bindings : ${JAVASTATUS} debug support : ${debug} "

1 0