February 2007 - Pacman-dev - lists.archlinux.org

[pacman-dev] CVS update of pacman-lib (TODO.aaron)
by Aaron Griffin 07 Feb '07

07 Feb '07

Date: Wednesday, February 7, 2007 @ 15:22:36 Author: aaron Path: /home/cvs-pacman/pacman-lib Modified: TODO.aaron (1.15 -> 1.16) ------------+ TODO.aaron | 8 ++++++++ 1 file changed, 8 insertions(+) Index: pacman-lib/TODO.aaron diff -u pacman-lib/TODO.aaron:1.15 pacman-lib/TODO.aaron:1.16 --- pacman-lib/TODO.aaron:1.15 Wed Feb 7 13:09:46 2007 +++ pacman-lib/TODO.aaron Wed Feb 7 15:22:36 2007 @@ -22,6 +22,14 @@ - clear up list allocation/deallocation - some lists need to be free'd, some do not and there is no clear indication WHEN this should happen. - remove DB entries (directories) on a read error? + - Add a pm_errstr error string, which will allow us to do things like: + pm_errno = PM_ERR_LIBARCHIVE; + pm_errstr = archive_error_string(archive); + or: + pm_errno = PM_ERR_LIBDOWNLOAD; + pm_errstr = downloadLastErrString; + This way we don't break abstraction when returning specific errors in + cases like the above. * pacman: A LOT of functions are way too long. There should be an upper limit of 100-200 lines. _alpm_add_commit is around 600 lines, and is far too complex.

1 0

Re: [pacman-dev] Documentation and manpages [was: Release Schedule for 3.0]
by Dan McGee 07 Feb '07

07 Feb '07

On 2/6/07, Aaron Griffin <aaronmgriffin(a)gmail.com> wrote: > I will see what i can do about the -S/-Su check AND makepkg > documentation in the next few hours. For manpages, what is our call? I feel like I may get stuck updating some of this, and this is my proposal: pacman.8: Similar to current pacman manpage, just updated/corrected for new options. makepkg.8: Document the makepkg program itself- eg command line flags, makepkg.conf if that is not a separate manpage, and refer people to PKGBUILD.5 for actual reference on building packages. PKGBUILD.5: Documentation for the actual format of a PKGBUILD, documenting all possible options and arrays,etc. libalpm.3: Actual documentation of the library functions. As well still want to clean this up, this is probably a low priority manpage, and the doxygen ones will suffice for now. Other possibilities: makepkg.conf.? pacman.conf.? Thoughts on this? -Dan

3 7

[pacman-dev] CVS update of pacman-lib/lib/libalpm (alpm.c)
by Aaron Griffin 07 Feb '07

07 Feb '07

Date: Wednesday, February 7, 2007 @ 01:19:40 Author: aaron Path: /home/cvs-pacman/pacman-lib/lib/libalpm Modified: alpm.c (1.111 -> 1.112) Copy/pasta error in alpm_get_upgrades that caused a segfault --------+ alpm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: pacman-lib/lib/libalpm/alpm.c diff -u pacman-lib/lib/libalpm/alpm.c:1.111 pacman-lib/lib/libalpm/alpm.c:1.112 --- pacman-lib/lib/libalpm/alpm.c:1.111 Sun Feb 4 03:26:52 2007 +++ pacman-lib/lib/libalpm/alpm.c Wed Feb 7 01:19:40 2007 @@ -1202,7 +1202,7 @@ pmsyncpkg_t *sync = NULL; found = 0; for(s = syncpkgs; s && !found; s = s->next) { - sync = i->data; + sync = s->data; if(sync && strcmp(sync->pkg->name, local->name) == 0) { found = 1; }

1 0

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

07 Feb '07

Date: Wednesday, February 7, 2007 @ 01:15:56 Author: dan Path: /home/cvs-pacman/pacman-lib Added: translation-help (1.1) * Added a 'translation-help' file for use by our translators. ------------------+ translation-help | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) Index: pacman-lib/translation-help diff -u /dev/null pacman-lib/translation-help:1.1 --- /dev/null Wed Feb 7 01:15:56 2007 +++ pacman-lib/translation-help Wed Feb 7 01:15:56 2007 @@ -0,0 +1,50 @@ +HOWTO: Help with translations +----------------------------- + +This document is here to guide you in helping translate pacman messages, +libalpm messages, and the manpages for the entire pacman package. + +A quick note- the gettext website is a very useful guide to read before +embarking on translation work, as it describes many of the commands in more +detail than I will here: +<http://www.gnu.org/software/gettext/manual/html_node/gettext.html> + +In addition, this site presents a small tutorial that I found useful: +<http://oriya.sarovar.org/docs/gettext/> + +Translating Messages +-------------------- + +The message files are located in two directories in pacman- lib/libalpm/po/ +and src/pacman/po/. Each language has a .po file associated with it; the .pot +file is the template file for creating new .po files and updating the messages +in them when the code changes. + +First things first. You will need to run ./autogen.sh and ./configure in the +base directory to generate the correct Makefiles. To update the translation +files, run this command: + make update-po + +At this point, the .pot file rereads the source code and updates its string +list, and the existing po files are merged if necessary to add new messages +or remove old ones. These po files can then either be hand edited, or modified +with a tool such as gtranslator or kbabel. + +Making a new language is not too hard, but be sure to follow all the steps. +You will have to do the following steps in both the lib/libalpm/po/ and +src/pacman/po/ directories, substituting where approriate. First, edit the +LINGUAS file and add your new language code at the bottom. Next, run the +following command, substituting 'libalpm.pot' or 'pacman.pot' depending on +which directory you are currently working in: + msginit -l <lang code> -o <lang code>.po -i <potfile> + +Look at the current message files for more guidance if necessary. Once you +create the new language file, you may need to slightly modify the headers; +try to make them look similar to the other .po file headers. In addition, for +all new translations we would strongly recommend using UTF-8 encoding. + +Translating Manpages +-------------------- + +(To Be Announced) +

1 0

[pacman-dev] CVS update of pacman-lib/lib/libalpm (package.c)
by Aaron Griffin 07 Feb '07

07 Feb '07

Date: Wednesday, February 7, 2007 @ 01:12:54 Author: aaron Path: /home/cvs-pacman/pacman-lib/lib/libalpm Modified: package.c (1.62 -> 1.63) Only honor 'force' if versions are NOT identical -----------+ package.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) Index: pacman-lib/lib/libalpm/package.c diff -u pacman-lib/lib/libalpm/package.c:1.62 pacman-lib/lib/libalpm/package.c:1.63 --- pacman-lib/lib/libalpm/package.c:1.62 Wed Feb 7 00:57:28 2007 +++ pacman-lib/lib/libalpm/package.c Wed Feb 7 01:12:53 2007 @@ -134,15 +134,13 @@ _alpm_db_read(pkg->data, INFRQ_DESC, pkg); } - if(pkg->force) { - /* skip the version compare call if this is a 'force' package */ - return(1); - } - /* compare versions and see if we need to upgrade */ cmp = alpm_versioncmp(local_pkg->version, pkg->version); - if(cmp > 0) { + if(cmp != 0 && pkg->force) { + cmp = 1; + _alpm_log(PM_LOG_WARNING, _("%s: forcing upgrade to version %s"), local_pkg->name, pkg->version); + } else if(cmp > 0) { /* local version is newer */ pmdb_t *db = pkg->data; _alpm_log(PM_LOG_WARNING, _("%s: local (%s) is newer than %s (%s)"),

1 0

[pacman-dev] CVS update of pacman-lib/lib/libalpm (package.c package.h sync.c)
by Aaron Griffin 07 Feb '07

07 Feb '07

Date: Wednesday, February 7, 2007 @ 00:57:28 Author: aaron Path: /home/cvs-pacman/pacman-lib/lib/libalpm Modified: package.c (1.61 -> 1.62) package.h (1.26 -> 1.27) sync.c (1.99 -> 1.100) Cleanup and more debug info for alpm_pkg_compare_versions -----------+ package.c | 29 ++++++++++++++++++----------- package.h | 1 + sync.c | 3 +-- 3 files changed, 20 insertions(+), 13 deletions(-) Index: pacman-lib/lib/libalpm/package.c diff -u pacman-lib/lib/libalpm/package.c:1.61 pacman-lib/lib/libalpm/package.c:1.62 --- pacman-lib/lib/libalpm/package.c:1.61 Tue Feb 6 16:28:29 2007 +++ pacman-lib/lib/libalpm/package.c Wed Feb 7 00:57:28 2007 @@ -123,39 +123,46 @@ } /* Is pkgB an upgrade for pkgA ? */ -int alpm_pkg_compare_versions(pmpkg_t *pkgA, pmpkg_t *pkgB) +int alpm_pkg_compare_versions(pmpkg_t *local_pkg, pmpkg_t *pkg) { - if(pkgB->origin == PKG_FROM_CACHE) { + int cmp = 0; + + ALPM_LOG_FUNC; + + if(pkg->origin == PKG_FROM_CACHE) { /* ensure we have the /desc file, which contains the 'force' option */ - _alpm_db_read(pkgB->data, INFRQ_DESC, pkgB); + _alpm_db_read(pkg->data, INFRQ_DESC, pkg); } - if(pkgB->force) { + if(pkg->force) { /* skip the version compare call if this is a 'force' package */ return(1); } /* compare versions and see if we need to upgrade */ - int cmp = alpm_versioncmp(pkgA->version, pkgB->version); + cmp = alpm_versioncmp(local_pkg->version, pkg->version); if(cmp > 0) { /* local version is newer */ - pmdb_t *db = pkgB->data; + pmdb_t *db = pkg->data; _alpm_log(PM_LOG_WARNING, _("%s: local (%s) is newer than %s (%s)"), - pkgA->name, pkgA->version, db->treename, pkgB->version); + local_pkg->name, local_pkg->version, db->treename, pkg->version); cmp = 0; - } else if(alpm_list_find_str(handle->ignorepkg, pkgB->name)) { + } else if(alpm_list_find_str(handle->ignorepkg, pkg->name)) { /* package should be ignored (IgnorePkg) */ _alpm_log(PM_LOG_WARNING, _("%s-%s: ignoring package upgrade (%s)"), - pkgA->name, pkgA->version, pkgB->version); + local_pkg->name, local_pkg->version, pkg->version); cmp = 0; - } else if(_alpm_pkg_istoonew(pkgB)) { + } else if(_alpm_pkg_istoonew(pkg)) { /* package too new (UpgradeDelay) */ _alpm_log(PM_LOG_DEBUG, _("%s-%s: delaying upgrade of package (%s)"), - pkgA->name, pkgA->version, pkgB->version); + local_pkg->name, local_pkg->version, pkg->version); cmp = 0; } + _alpm_log(PM_LOG_DEBUG, _("compare versions for %s: %s vs %s, result=%d"), + local_pkg->name, local_pkg->version, pkg->version, cmp); + return(cmp); } Index: pacman-lib/lib/libalpm/package.h diff -u pacman-lib/lib/libalpm/package.h:1.26 pacman-lib/lib/libalpm/package.h:1.27 --- pacman-lib/lib/libalpm/package.h:1.26 Tue Feb 6 15:57:17 2007 +++ pacman-lib/lib/libalpm/package.h Wed Feb 7 00:57:28 2007 @@ -94,6 +94,7 @@ pmpkg_t *_alpm_pkg_dup(pmpkg_t *pkg); void _alpm_pkg_free(void *data); int _alpm_pkg_cmp(const void *p1, const void *p2); +int alpm_pkg_compare_versions(pmpkg_t *pkgA, pmpkg_t *pkgB); 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); Index: pacman-lib/lib/libalpm/sync.c diff -u pacman-lib/lib/libalpm/sync.c:1.99 pacman-lib/lib/libalpm/sync.c:1.100 --- pacman-lib/lib/libalpm/sync.c:1.99 Tue Feb 6 12:39:32 2007 +++ pacman-lib/lib/libalpm/sync.c Wed Feb 7 00:57:28 2007 @@ -199,7 +199,6 @@ /* match installed packages with the sync dbs and compare versions */ _alpm_log(PM_LOG_DEBUG, _("checking for package upgrades")); for(i = _alpm_db_get_pkgcache(db_local, INFRQ_NONE); i; i = i->next) { - int cmp; int replace=0; pmpkg_t *local = i->data; pmpkg_t *spkg = NULL; @@ -262,7 +261,7 @@ pmpkg_t *local; pmpkg_t *spkg = NULL; pmsyncpkg_t *sync; - int cmp, repo_found = 0; + int repo_found = 0; ALPM_LOG_FUNC;

1 0

[pacman-dev] CVS update of pacman-lib/src/pacman (downloadprog.c query.c)
by Aaron Griffin 07 Feb '07

07 Feb '07

Date: Wednesday, February 7, 2007 @ 00:25:45 Author: aaron Path: /home/cvs-pacman/pacman-lib/src/pacman Modified: downloadprog.c (1.11 -> 1.12) query.c (1.23 -> 1.24) * Fix total transfered size on download bar * Fix -Qm segfault * Minor query cleanup ----------------+ downloadprog.c | 2 - query.c | 79 +++++++++++++++++++++++-------------------------------- 2 files changed, 35 insertions(+), 46 deletions(-) Index: pacman-lib/src/pacman/downloadprog.c diff -u pacman-lib/src/pacman/downloadprog.c:1.11 pacman-lib/src/pacman/downloadprog.c:1.12 --- pacman-lib/src/pacman/downloadprog.c:1.11 Tue Feb 6 22:15:18 2007 +++ pacman-lib/src/pacman/downloadprog.c Wed Feb 7 00:25:45 2007 @@ -147,7 +147,7 @@ } printf(" %-*s %6d%c %#6.1f%c/s %02u:%02u:%02u", FILENAME_TRIM_LEN, fname, - xfered/1024, xfered_size, rate, rate_size, eta_h, eta_m, eta_s); + xfered, xfered_size, rate, rate_size, eta_h, eta_m, eta_s); free(fname); Index: pacman-lib/src/pacman/query.c diff -u pacman-lib/src/pacman/query.c:1.23 pacman-lib/src/pacman/query.c:1.24 --- pacman-lib/src/pacman/query.c:1.23 Tue Feb 6 17:36:14 2007 +++ pacman-lib/src/pacman/query.c Wed Feb 7 00:25:45 2007 @@ -81,7 +81,7 @@ int pacman_query(alpm_list_t *targets) { - alpm_list_t *sync_dbs = NULL, *i, *j;; + alpm_list_t *sync_dbs = NULL, *i, *j, *k; pmpkg_t *info = NULL; char *package = NULL; int done = 0; @@ -224,69 +224,58 @@ if(info == NULL) { /* something weird happened */ ERR(NL, _("package \"%s\" not found\n"), pkgname); - /* do not return on query operations - let's just carry on */ - /*return(1);*/ continue; } - if(config->op_q_foreign) { - int match = 0; - for(i = sync_dbs; i; i = alpm_list_next(i)) { - pmdb_t *db = (pmdb_t *)alpm_list_getdata(i); - for(j = alpm_db_getpkgcache(db); j; j = alpm_list_next(j)) { - pmpkg_t *pkg = alpm_list_getdata(j); - if(strcmp(alpm_pkg_get_name(pkg), alpm_pkg_get_name(info)) == 0) { - match = 1; - } + } + if(config->op_q_foreign) { + int match = 0; + for(j = sync_dbs; j; j = alpm_list_next(j)) { + pmdb_t *db = (pmdb_t *)alpm_list_getdata(j); + for(k = alpm_db_getpkgcache(db); k; k = alpm_list_next(k)) { + pmpkg_t *pkg = alpm_list_getdata(k); + if(strcmp(alpm_pkg_get_name(pkg), alpm_pkg_get_name(info)) == 0) { + match = 1; } } - if(match==0) { - MSG(NL, "%s %s\n", pkgname, pkgver); - } } - if(config->op_q_list) { - dump_pkg_files(info); + if(match==0) { + MSG(NL, "%s %s\n", pkgname, pkgver); + } + } else if(config->op_q_list) { + dump_pkg_files(info); + } else if(config->op_q_orphans) { + if(alpm_pkg_get_requiredby(info) == NULL + && (long)alpm_pkg_get_reason(info) == PM_PKG_REASON_DEPEND) { + MSG(NL, "%s %s\n", pkgname, pkgver); } - if(config->op_q_orphans) { - if(alpm_pkg_get_requiredby(info) == NULL - && (long)alpm_pkg_get_reason(info) == PM_PKG_REASON_DEPEND) { - MSG(NL, "%s %s\n", pkgname, pkgver); - } - } } else { MSG(NL, "%s %s\n", pkgname, pkgver); } } } else { - info = alpm_db_readpkg(db_local, package); if(info == NULL) { ERR(NL, _("package \"%s\" not found\n"), package); - /* do not return on query operations - let's just carry on */ - /*return(2);*/ continue; } /* find a target */ - if(config->op_q_changelog || config->op_q_info || config->op_q_list) { - if(config->op_q_changelog) { - char changelog[PATH_MAX]; - snprintf(changelog, PATH_MAX, "%s%s/%s/%s-%s/changelog", - alpm_option_get_root(), alpm_option_get_dbpath(), - alpm_db_get_name(db_local), - alpm_pkg_get_name(info), - alpm_pkg_get_version(info)); - dump_pkg_changelog(changelog, alpm_pkg_get_name(info)); - } - if(config->op_q_info) { - dump_pkg_full(info, config->op_q_info); - } - if(config->op_q_list) { - dump_pkg_files(info); - } + if(config->op_q_changelog) { + char changelog[PATH_MAX]; + snprintf(changelog, PATH_MAX, "%s%s/%s/%s-%s/changelog", + alpm_option_get_root(), alpm_option_get_dbpath(), + alpm_db_get_name(db_local), + alpm_pkg_get_name(info), + alpm_pkg_get_version(info)); + dump_pkg_changelog(changelog, alpm_pkg_get_name(info)); + } else if(config->op_q_info) { + dump_pkg_full(info, config->op_q_info); + } else if(config->op_q_list) { + dump_pkg_files(info); } else if(config->op_q_orphans) { - if(alpm_pkg_get_requiredby(info) == NULL) { - MSG(NL, "%s %s\n", alpm_pkg_get_name(info), alpm_pkg_get_version(info)); - } + if(alpm_pkg_get_requiredby(info) == NULL) { + MSG(NL, "%s %s\n", alpm_pkg_get_name(info), alpm_pkg_get_version(info)); + } } else { MSG(NL, "%s %s\n", alpm_pkg_get_name(info), alpm_pkg_get_version(info)); }

1 0

[pacman-dev] CVS update of pacman-lib/src/pacman (downloadprog.c)
by Aaron Griffin 07 Feb '07

07 Feb '07

Date: Tuesday, February 6, 2007 @ 22:15:18 Author: aaron Path: /home/cvs-pacman/pacman-lib/src/pacman Modified: downloadprog.c (1.10 -> 1.11) I broke the progress bars earlier. Put that back to normal. ----------------+ downloadprog.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: pacman-lib/src/pacman/downloadprog.c diff -u pacman-lib/src/pacman/downloadprog.c:1.10 pacman-lib/src/pacman/downloadprog.c:1.11 --- pacman-lib/src/pacman/downloadprog.c:1.10 Tue Feb 6 16:54:39 2007 +++ pacman-lib/src/pacman/downloadprog.c Tue Feb 6 22:15:18 2007 @@ -73,7 +73,7 @@ timediff = get_update_timediff(0); } - if(percent > 0 && percent <= 100 && !timediff) { + if(percent > 0 && percent < 100 && !timediff) { /* only update the progress bar when * a) we first start * b) we end the progress

1 0

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

06 Feb '07

Date: Tuesday, February 6, 2007 @ 17:36:14 Author: dan Path: /home/cvs-pacman/pacman-lib Modified: NEWS (1.6 -> 1.7) TODO.dan (1.3 -> 1.4) etc/makepkg.conf.in (1.11 -> 1.12) lib/libalpm/po/POTFILES.in (1.2 -> 1.3) scripts/makepkg (1.44 -> 1.45) src/pacman/package.c (1.26 -> 1.27) src/pacman/query.c (1.22 -> 1.23) * Makepkg updates, and small bugfix on man page compression. * Change libtool default to makepkg2 behavior. * Other small changes. ----------------------------+ NEWS | 1 + TODO.dan | 1 - etc/makepkg.conf.in | 2 +- lib/libalpm/po/POTFILES.in | 2 +- scripts/makepkg | 10 +++++++++- src/pacman/package.c | 3 +-- src/pacman/query.c | 2 +- 7 files changed, 14 insertions(+), 7 deletions(-) Index: pacman-lib/NEWS diff -u pacman-lib/NEWS:1.6 pacman-lib/NEWS:1.7 --- pacman-lib/NEWS:1.6 Fri Feb 2 22:46:06 2007 +++ pacman-lib/NEWS Tue Feb 6 17:36:13 2007 @@ -21,6 +21,7 @@ - added pactest testing suite - abs - supports cvsup/csup, expanded configuration - makepkg fixes: + - new configuration file options format - support alternate integrity checks - extract files using filetype, not extension - added noextract array Index: pacman-lib/TODO.dan diff -u pacman-lib/TODO.dan:1.3 pacman-lib/TODO.dan:1.4 --- pacman-lib/TODO.dan:1.3 Sun Feb 4 13:28:21 2007 +++ pacman-lib/TODO.dan Tue Feb 6 17:36:13 2007 @@ -46,7 +46,6 @@ -- http://everything2.com/?node_id=556079 Quick hits: -* log_progress and cb_trans_progress - same function? not quite but close * unsigned int vs. unsigned * 'ldd' & 'ldd -u' - many linkages * possibly split utilities/extras from pacman package Index: pacman-lib/etc/makepkg.conf.in diff -u pacman-lib/etc/makepkg.conf.in:1.11 pacman-lib/etc/makepkg.conf.in:1.12 --- pacman-lib/etc/makepkg.conf.in:1.11 Sun Feb 4 13:31:39 2007 +++ pacman-lib/etc/makepkg.conf.in Tue Feb 6 17:36:13 2007 @@ -56,7 +56,7 @@ #-- libtool: Leave libtool (.la) files in binaries #-- emptydirs: Leave empty directories in binaries # -OPTIONS=(strip !docs !libtool emptydirs) +OPTIONS=(strip !docs libtool emptydirs) #-- File integrity checks to use. Valid: md5, sha1, sha256, sha384, sha512 INTEGRITY_CHECK=(md5 sha1) Index: pacman-lib/lib/libalpm/po/POTFILES.in diff -u pacman-lib/lib/libalpm/po/POTFILES.in:1.2 pacman-lib/lib/libalpm/po/POTFILES.in:1.3 --- pacman-lib/lib/libalpm/po/POTFILES.in:1.2 Sun Oct 15 15:31:07 2006 +++ pacman-lib/lib/libalpm/po/POTFILES.in Tue Feb 6 17:36:13 2007 @@ -1,5 +1,6 @@ add.c alpm.c +alpm_list.c backup.c be_files.c cache.c @@ -9,7 +10,6 @@ error.c group.c handle.c -list.c log.c md5.c md5driver.c Index: pacman-lib/scripts/makepkg diff -u pacman-lib/scripts/makepkg:1.44 pacman-lib/scripts/makepkg:1.45 --- pacman-lib/scripts/makepkg:1.44 Tue Feb 6 16:20:20 2007 +++ pacman-lib/scripts/makepkg Tue Feb 6 17:36:14 2007 @@ -862,7 +862,8 @@ fi # move /usr/share/man files to /usr/man -if [ -d pkg/usr/share/man ]; then +if [ -d $startdir/pkg/usr/share/man ]; then + cd $startdir mkdir -p pkg/usr/man cp -a pkg/usr/share/man/* pkg/usr/man/ rm -rf pkg/usr/share/man @@ -964,6 +965,13 @@ echo "backup = $it" >>.PKGINFO done +# TODO maybe remove this at some point +# warn if license array is not present or empty +if [ "$license" = "" ]; then + warning "Please add a license line to your $BUILDSCRIPT!" + plain "example for GPL'ed software: license=('GPL')." +fi + # check for an install script if [ "$install" != "" ]; then msg "Copying install script..." Index: pacman-lib/src/pacman/package.c diff -u pacman-lib/src/pacman/package.c:1.26 pacman-lib/src/pacman/package.c:1.27 --- pacman-lib/src/pacman/package.c:1.26 Wed Jan 31 21:16:13 2007 +++ pacman-lib/src/pacman/package.c Tue Feb 6 17:36:14 2007 @@ -98,9 +98,8 @@ if(level > 1) { /* call new backup function */ dump_pkg_backups(pkg); + printf("\n"); } - - printf("\n"); } /* Display the content of a sync package Index: pacman-lib/src/pacman/query.c diff -u pacman-lib/src/pacman/query.c:1.22 pacman-lib/src/pacman/query.c:1.23 --- pacman-lib/src/pacman/query.c:1.22 Sun Feb 4 03:26:53 2007 +++ pacman-lib/src/pacman/query.c Tue Feb 6 17:36:14 2007 @@ -125,7 +125,7 @@ } if(config->op_q_upgrade) { - MSG(NL, _("Checking for package upgrades")); + MSG(NL, _("Checking for package upgrades...")); alpm_list_t *syncpkgs; if((syncpkgs = alpm_get_upgrades()) != NULL) {

1 0

[pacman-dev] CVS update of pacman-lib/src/pacman (downloadprog.c)
by Aaron Griffin 06 Feb '07

06 Feb '07

Date: Tuesday, February 6, 2007 @ 16:54:39 Author: aaron Path: /home/cvs-pacman/pacman-lib/src/pacman Modified: downloadprog.c (1.9 -> 1.10) Minor experimental changes to the download progress bar: * change to Mb and Gb for both total size and transfer rate if needed * round up to 1 second for downloads that were between 1s and 0.5s This function needs some serious looking at, as it's probably not 64bit safe (thus the "wrong calculation" problem on the list). ----------------+ downloadprog.c | 50 ++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 38 insertions(+), 12 deletions(-) Index: pacman-lib/src/pacman/downloadprog.c diff -u pacman-lib/src/pacman/downloadprog.c:1.9 pacman-lib/src/pacman/downloadprog.c:1.10 --- pacman-lib/src/pacman/downloadprog.c:1.9 Sat Feb 3 20:36:45 2007 +++ pacman-lib/src/pacman/downloadprog.c Tue Feb 6 16:54:39 2007 @@ -73,7 +73,7 @@ timediff = get_update_timediff(0); } - if(percent > 0 && percent < 100 && !timediff) { + if(percent > 0 && percent <= 100 && !timediff) { /* only update the progress bar when * a) we first start * b) we end the progress @@ -84,17 +84,22 @@ gettimeofday(&current_time, NULL); total_timediff = current_time.tv_sec-initial_time.tv_sec - + (float)(current_time.tv_usec-initial_time.tv_usec) / 1000000; + + (float)(current_time.tv_usec-initial_time.tv_usec) / 1000000.0; if(xfered == total) { /* compute final values */ - rate = (float)total / (total_timediff * 1024); - eta_s = (unsigned int)total_timediff; + rate = (float)total / (total_timediff * 1024.0); + if(total_timediff < 1.0 && total_timediff > 0.5) { + /* round up so we don't display 00:00:00 for quick downloads all the time*/ + eta_s = 1; + } else { + eta_s = (unsigned int)total_timediff; + } set_output_padding(0); /* shut off padding */ } else { - rate = (float)(xfered - xfered_last) / (timediff * 1024); + rate = (float)(xfered - xfered_last) / (timediff * 1024.0); rate = (float)(rate + 2*rate_last) / 3; - eta_s = (unsigned int)(total - xfered) / (rate * 1024); + eta_s = (unsigned int)(total - xfered) / (rate * 1024.0); } rate_last = rate; @@ -114,14 +119,35 @@ fname[FILENAME_TRIM_LEN] = '\0'; } - /* 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; + /* Awesome formatting for progress bar. We need a mess of Kb->Mb->Gb stuff + * here. We'll use limit of 2048 for each until we get some empirical */ + char rate_size = 'K'; + char xfered_size = 'K'; + if(rate > 2048.0) { + rate /= 1024.0; + rate_size = 'M'; + if(rate > 2048.0) { + rate /= 1024.0; + rate_size = 'G'; + /* we should not go higher than this for a few years (9999.9 Gb/s?)*/ + } } - printf(" %-*s %6dK %#6.1fK/s %02u:%02u:%02u", FILENAME_TRIM_LEN, fname, - xfered/1024, rate, eta_h, eta_m, eta_s); + xfered /= 1024; /* convert to K by default */ + if(xfered > 2048) { + xfered /= 1024; + xfered_size = 'M'; + if(xfered > 2048) { + xfered /= 1024; + xfered_size = 'G'; + /* I should seriously hope that archlinux packages never break + * the 9999.9GB mark... we'd have more serious problems than the progress + * bar in pacman */ + } + } + + printf(" %-*s %6d%c %#6.1f%c/s %02u:%02u:%02u", FILENAME_TRIM_LEN, fname, + xfered/1024, xfered_size, rate, rate_size, eta_h, eta_m, eta_s); free(fname);

1 0