- Pacman-dev - lists.archlinux.org

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

10 Feb '07

Date: Saturday, February 10, 2007 @ 04:34:59 Author: aaron Path: /home/cvs-pacman/pacman-lib/src/pacman Modified: Makefile.am (1.13 -> 1.14) downloadprog.c (1.13 -> 1.14) log.c (1.28 -> 1.29) util.c (1.28 -> 1.29) Cleaned up some more output * Questions no longer start with "error:" * downloaded size is output as a float now ----------------+ Makefile.am | 8 ++++---- downloadprog.c | 20 +++++++++++--------- log.c | 2 +- util.c | 4 +++- 4 files changed, 19 insertions(+), 15 deletions(-) Index: pacman-lib/src/pacman/Makefile.am diff -u pacman-lib/src/pacman/Makefile.am:1.13 pacman-lib/src/pacman/Makefile.am:1.14 --- pacman-lib/src/pacman/Makefile.am:1.13 Mon Jan 29 17:18:32 2007 +++ pacman-lib/src/pacman/Makefile.am Sat Feb 10 04:34:59 2007 @@ -16,10 +16,10 @@ pacman_static_SOURCES = $(pacman_SOURCES) -pacman_LDADD = -L$(top_builddir)/lib/libalpm/.libs \ - -ldownload -lalpm +pacman_LDADD = $(top_builddir)/lib/libalpm/.libs/libalpm.so \ + -ldownload -pacman_static_LDADD = -L$(top_builddir)/lib/libalpm/.libs/ \ - -ldownload -lalpm +pacman_static_LDADD = $(top_builddir)/lib/libalpm/.libs/libalpm.la \ + -ldownload pacman_static_LDFLAGS = $(LDFLAGS) -all-static Index: pacman-lib/src/pacman/downloadprog.c diff -u pacman-lib/src/pacman/downloadprog.c:1.13 pacman-lib/src/pacman/downloadprog.c:1.14 --- pacman-lib/src/pacman/downloadprog.c:1.13 Thu Feb 8 15:44:47 2007 +++ pacman-lib/src/pacman/downloadprog.c Sat Feb 10 04:34:59 2007 @@ -53,7 +53,7 @@ const int infolen = 50; char *fname, *p; - float rate = 0.0, timediff = 0.0; + float rate = 0.0, timediff = 0.0, f_xfered = 0.0; unsigned int eta_h = 0, eta_m = 0, eta_s = 0; int percent; char rate_size = 'K', xfered_size = 'K'; @@ -112,11 +112,13 @@ eta_s -= eta_m * 60; fname = strdup(filename); + /* strip extension if it's there + * NOTE: in the case of package files, only the pkgname is sent now */ if((p = strstr(fname, PM_EXT_PKG)) || (p = strstr(fname, PM_EXT_DB))) { *p = '\0'; } if(strlen(fname) > FILENAME_TRIM_LEN) { - fname[FILENAME_TRIM_LEN] = '\0'; + strcpy(fname + FILENAME_TRIM_LEN -3,"..."); } /* Awesome formatting for progress bar. We need a mess of Kb->Mb->Gb stuff @@ -132,13 +134,13 @@ } } - xfered /= 1024; /* convert to K by default */ + f_xfered = (float) xfered / 1024.0; /* convert to K by default */ /* xfered_size = 'K'; was set above */ - if(xfered > 2048) { - xfered /= 1024; + if(f_xfered > 2048.0) { + f_xfered /= 1024.0; xfered_size = 'M'; - if(xfered > 2048) { - xfered /= 1024; + if(f_xfered > 2048.0) { + f_xfered /= 1024.0; 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 @@ -146,8 +148,8 @@ } } - printf(" %-*s %6d%c %#6.1f%c/s %02u:%02u:%02u", FILENAME_TRIM_LEN, fname, - xfered, xfered_size, rate, rate_size, eta_h, eta_m, eta_s); + printf(" %-*s %6.1f%c %#6.1f%c/s %02u:%02u:%02u", FILENAME_TRIM_LEN, fname, + f_xfered, xfered_size, rate, rate_size, eta_h, eta_m, eta_s); free(fname); Index: pacman-lib/src/pacman/log.c diff -u pacman-lib/src/pacman/log.c:1.28 pacman-lib/src/pacman/log.c:1.29 --- pacman-lib/src/pacman/log.c:1.28 Fri Feb 9 11:02:01 2007 +++ pacman-lib/src/pacman/log.c Sat Feb 10 04:34:59 2007 @@ -175,7 +175,7 @@ va_end(args); /* Use stderr so questions are always displayed when redirecting output */ - ERR(NL, str); + pm_fprintf(stderr, NL, str); \ if(fgets(response, 32, stdin)) { /* trim whitespace and newlines */ Index: pacman-lib/src/pacman/util.c diff -u pacman-lib/src/pacman/util.c:1.28 pacman-lib/src/pacman/util.c:1.29 --- pacman-lib/src/pacman/util.c:1.28 Thu Feb 8 15:44:48 2007 +++ pacman-lib/src/pacman/util.c Sat Feb 10 04:34:59 2007 @@ -418,10 +418,12 @@ printf("-"); } } - printf("] %3d%%\r", percent); + printf("] %3d%%", percent); if(percent == 100) { printf("\n"); + } else { + printf("\r"); } fflush(stdout); }

2 1

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

10 Feb '07

Date: Saturday, February 10, 2007 @ 04:36:36 Author: aaron Path: /home/cvs-pacman/pacman-lib/lib/libalpm Modified: add.c (1.111 -> 1.112) alpm.c (1.115 -> 1.116) server.c (1.20 -> 1.21) * 'add' percentages now cap at 100% (see the comment) * downloaded packages now pass ONLY the package name to the callback ----------+ add.c | 16 +++++++++++++--- alpm.c | 9 +++++---- server.c | 15 +++++++++++++-- 3 files changed, 31 insertions(+), 9 deletions(-) Index: pacman-lib/lib/libalpm/add.c diff -u pacman-lib/lib/libalpm/add.c:1.111 pacman-lib/lib/libalpm/add.c:1.112 --- pacman-lib/lib/libalpm/add.c:1.111 Fri Feb 9 16:08:10 2007 +++ pacman-lib/lib/libalpm/add.c Sat Feb 10 04:36:36 2007 @@ -496,10 +496,20 @@ char pathname[PATH_MAX]; struct stat buf; - STRNCPY(pathname, archive_entry_pathname (entry), PATH_MAX); + STRNCPY(pathname, archive_entry_pathname(entry), PATH_MAX); - if (info->size != 0) - percent = (double)archive_position_uncompressed(archive) / info->size; + if (info->size != 0) { + /* There's a problem here. These sizes don't match up. info->size is + * the COMPRESSED size, and info->isize is uncompressed. It appears, + * however, that these are the only two sizes available. It appears + * to be close enough, BUT easilly goes over 100%, so we'll stall + * there for now */ + percent = (double)archive_position_uncompressed(archive) / info->size; + if(percent >= 1.0) { + percent = 1.0; + } + } + if (needdisp == 0) { PROGRESS(trans, cb_state, what, (int)(percent * 100), alpm_list_count(trans->packages), (alpm_list_count(trans->packages) - alpm_list_count(targ) +1)); } Index: pacman-lib/lib/libalpm/alpm.c diff -u pacman-lib/lib/libalpm/alpm.c:1.115 pacman-lib/lib/libalpm/alpm.c:1.116 --- pacman-lib/lib/libalpm/alpm.c:1.115 Fri Feb 9 16:54:57 2007 +++ pacman-lib/lib/libalpm/alpm.c Sat Feb 10 04:36:36 2007 @@ -593,14 +593,15 @@ arch = _supported_archs[i]; /* whee, case insensitive compare */ - while(*arch && *cmp && tolower(*arch++) == tolower(*cmp++)) ; - if(*arch || *cmp) continue; + if(*arch || *cmp) { + continue; + } - return p; + return(p); } } - return NULL; + return(NULL); } /** @} */ Index: pacman-lib/lib/libalpm/server.c diff -u pacman-lib/lib/libalpm/server.c:1.20 pacman-lib/lib/libalpm/server.c:1.21 --- pacman-lib/lib/libalpm/server.c:1.20 Fri Feb 9 05:10:49 2007 +++ pacman-lib/lib/libalpm/server.c Sat Feb 10 04:36:36 2007 @@ -37,6 +37,7 @@ #include "util.h" #include "handle.h" #include "log.h" +#include "package.h" pmserver_t *_alpm_server_new(const char *url) { @@ -180,12 +181,22 @@ char realfile[PATH_MAX]; char output[PATH_MAX]; char *fn = (char *)lp->data; + char pkgname[PKG_NAME_LEN]; + char *p; fileurl = url_for_file(server, fn); if(!fileurl) { return(-1); } + /* Try to get JUST the name of the package from the filename */ + p = alpm_pkg_name_hasarch(fn); /* TODO remove this later */ + _alpm_pkg_splitname(fn, pkgname, NULL, (p != NULL)); + if(!strlen(pkgname)) { + /* just use the raw filename if we can't find crap */ + STRNCPY(pkgname, fn, PKG_NAME_LEN); + } + snprintf(realfile, PATH_MAX, "%s/%s", localpath, fn); snprintf(output, PATH_MAX, "%s/%s.part", localpath, fn); @@ -278,7 +289,7 @@ } /* Progress 0 - initialize */ - if(handle->dlcb) handle->dlcb(fn, 0, ust.size); + if(handle->dlcb) handle->dlcb(pkgname, 0, ust.size); int nread = 0; char buffer[PM_DLBUF_LEN]; @@ -287,7 +298,7 @@ while((nwritten += fwrite(buffer, 1, (nread - nwritten), localf)) < nread) ; dltotal_bytes += nread; - if(handle->dlcb) handle->dlcb(fn, dltotal_bytes, ust.size); + if(handle->dlcb) handle->dlcb(pkgname, dltotal_bytes, ust.size); } fclose(localf);

1 0

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

10 Feb '07

Date: Saturday, February 10, 2007 @ 03:10:22 Author: juergen Path: /home/cvs-pacman/pacman-lib Modified: Makefile.am (1.10 -> 1.11) * fixed dist target -------------+ Makefile.am | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) Index: pacman-lib/Makefile.am diff -u pacman-lib/Makefile.am:1.10 pacman-lib/Makefile.am:1.11 --- pacman-lib/Makefile.am:1.10 Wed Feb 7 17:29:21 2007 +++ pacman-lib/Makefile.am Sat Feb 10 03:10:22 2007 @@ -1,11 +1,9 @@ SUBDIRS = lib/libalpm src/util src/pacman scripts doc etc EXTRA_DIST = \ - ChangeLog \ + NEWS \ COPYING \ - README \ - TODO \ - TODO.autoconf + README check: src/pacman cd pactest; python pactest.py --test=tests/*.py -p ../src/pacman/pacman --debug=-1

1 0

[pacman-dev] Man pages (and a quick ML note)
by Dan McGee 10 Feb '07

10 Feb '07

Hey guys, I've been working on the manpages a lot in the past day or two, and I believe they are pretty up to date now with the changes that have been made. I'd appreciate people looking them over, giving me some (constructive) criticism, and pointing anything out that needs changing, updating, or a typo fixed, etc. If it is small, just send an email telling me what needs fixing, if large, feel free to submit a patch (but if you are unfamiliar with the man page format, then just describe the change and I'll implement it). On a side note, if the topic of a thread changes on the ML, can you guys update the subject before you reply? That way talk about bug #4744 doesn't end up in the bug #5775 thread, and makes keeping track of multiple topics a lot easier. -Dan

3 6

[pacman-dev] Fwd: FS#6378: pacman 3: output issues
by Dan McGee 09 Feb '07

09 Feb '07

> FS#6378 - pacman 3: output issues > User who did this: - Roman Kyrylych (Romashka) > > ---------- > 1) I meant that it would be nice to have output like 2,0M -> 2,3M -> > 2,7M -> 3,2M, than just 2M -> 3M That is what the int -> float change does, if you know the C language types- it allows decimal places. > 2) I don't understand what you mean by "translate from language to > language" :-/ Does "..." mean "name continues but it is too long" in all languages? Of course, gettext should be able to translate this string, but the original question still stands if there is a punctuation mark in all languages used for the same purpose the English "..." is. -Dan

2 1

Re: [pacman-dev] FS#6316: Pacman 3 release bugcatcher
by Dan McGee 09 Feb '07

09 Feb '07

> The following task has a new comment added: > > FS#6316 - Pacman 3 release bugcatcher > User who did this: - Roman Kyrylych (Romashka) > > ---------- > I added Total Download Size feature request because it can be > implemented along with other output fixes/changes. > ---------- > > More information can be found at the following URL: > http://bugs.archlinux.org/task/6316#comment14228 Roman, the problem with this is it truely is a feature request- it may not be that easy to add at this point in the development cycle. I believe when the other sizes are presented, we have done nothing yet to see if those packages are cached or not, so thus do not know the actual download size. It may have to wait for pacman 3.1. -Dan

3 2

[pacman-dev] pacman3 backup=()
by Roman Kyrylych 09 Feb '07

09 Feb '07

Please add all needed files to backup array for next RC. I often use local mirror and had to modify pacman3.conf few times. -- Roman Kyrylych (Роман Кирилич)

3 3

[pacman-dev] CVS update of pacman-lib/etc/pacman.d (gen-mirrorlist.sh)
by Juergen Hoetzel 09 Feb '07

09 Feb '07

Date: Friday, February 9, 2007 @ 17:09:28 Author: juergen Path: /home/cvs-pacman/pacman-lib/etc/pacman.d Removed: gen-mirrorlist.sh (1.1) * gen-mirrorlist.sh not needed anymore -------------------+ gen-mirrorlist.sh | 12 ------------ 1 file changed, 12 deletions(-) Index: pacman-lib/etc/pacman.d/gen-mirrorlist.sh diff -u pacman-lib/etc/pacman.d/gen-mirrorlist.sh:1.1 pacman-lib/etc/pacman.d/gen-mirrorlist.sh:removed --- pacman-lib/etc/pacman.d/gen-mirrorlist.sh:1.1 Thu Dec 28 11:54:35 2006 +++ pacman-lib/etc/pacman.d/gen-mirrorlist.sh Fri Feb 9 17:09:28 2007 @@ -1,12 +0,0 @@ -#!/bin/bash -# gen-mirrorlist.sh -# There's absolutely no way to make autoconf do this, so instead, autoconf will -# call this script - simple enough. - - -REPOS="current extra unstable release community" - -for i in $REPOS; do - rm -f $i - cat mirrorlist | sed "s|@@REPO@@|$i|g" > $i -done

1 0

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

09 Feb '07

Date: Friday, February 9, 2007 @ 16:54:58 Author: dan Path: /home/cvs-pacman/pacman-lib Modified: .cvsignore (1.3 -> 1.4) doc/.cvsignore (1.1 -> 1.2) lib/libalpm/alpm.c (1.114 -> 1.115) lib/libalpm/package.c (1.64 -> 1.65) lib/libalpm/po/.cvsignore (1.2 -> 1.3) lib/libalpm/versioncmp.h (1.7 -> 1.8) src/pacman/po/.cvsignore (1.2 -> 1.3) src/util/.cvsignore (1.1 -> 1.2) * Fix compile errors/warnings. * Update .cvsignore files a bit. ---------------------------+ .cvsignore | 3 +++ doc/.cvsignore | 3 +-- lib/libalpm/alpm.c | 1 - lib/libalpm/package.c | 3 ++- lib/libalpm/po/.cvsignore | 2 -- lib/libalpm/versioncmp.h | 2 +- src/pacman/po/.cvsignore | 2 -- src/util/.cvsignore | 1 - 8 files changed, 7 insertions(+), 10 deletions(-) Index: pacman-lib/.cvsignore diff -u pacman-lib/.cvsignore:1.3 pacman-lib/.cvsignore:1.4 --- pacman-lib/.cvsignore:1.3 Wed Jan 24 03:51:50 2007 +++ pacman-lib/.cvsignore Fri Feb 9 16:54:57 2007 @@ -16,3 +16,6 @@ ltmain.sh missing stamp-h1 + +tags +cscope.out Index: pacman-lib/doc/.cvsignore diff -u pacman-lib/doc/.cvsignore:1.1 pacman-lib/doc/.cvsignore:1.2 --- pacman-lib/doc/.cvsignore:1.1 Mon Mar 27 12:17:35 2006 +++ pacman-lib/doc/.cvsignore Fri Feb 9 16:54:57 2007 @@ -1,4 +1,3 @@ Makefile Makefile.in -*.3 -*.8 +man3 Index: pacman-lib/lib/libalpm/alpm.c diff -u pacman-lib/lib/libalpm/alpm.c:1.114 pacman-lib/lib/libalpm/alpm.c:1.115 --- pacman-lib/lib/libalpm/alpm.c:1.114 Fri Feb 9 16:08:10 2007 +++ pacman-lib/lib/libalpm/alpm.c Fri Feb 9 16:54:57 2007 @@ -1146,7 +1146,6 @@ /* 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; Index: pacman-lib/lib/libalpm/package.c diff -u pacman-lib/lib/libalpm/package.c:1.64 pacman-lib/lib/libalpm/package.c:1.65 --- pacman-lib/lib/libalpm/package.c:1.64 Fri Feb 9 16:08:10 2007 +++ pacman-lib/lib/libalpm/package.c Fri Feb 9 16:54:57 2007 @@ -31,13 +31,14 @@ #include <locale.h> #include <errno.h> /* pacman */ +#include "package.h" #include "log.h" #include "util.h" #include "error.h" #include "alpm_list.h" -#include "package.h" #include "db.h" #include "handle.h" +#include "versioncmp.h" #include "alpm.h" pmpkg_t *_alpm_pkg_new(const char *name, const char *version) Index: pacman-lib/lib/libalpm/po/.cvsignore diff -u pacman-lib/lib/libalpm/po/.cvsignore:1.2 pacman-lib/lib/libalpm/po/.cvsignore:1.3 --- pacman-lib/lib/libalpm/po/.cvsignore:1.2 Thu Feb 8 00:36:26 2007 +++ pacman-lib/lib/libalpm/po/.cvsignore Fri Feb 9 16:54:57 2007 @@ -3,6 +3,4 @@ *.gmo POTFILES stamp-po - -remove-potcdate.sin remove-potcdate.sed Index: pacman-lib/lib/libalpm/versioncmp.h diff -u pacman-lib/lib/libalpm/versioncmp.h:1.7 pacman-lib/lib/libalpm/versioncmp.h:1.8 --- pacman-lib/lib/libalpm/versioncmp.h:1.7 Fri Feb 9 16:08:10 2007 +++ pacman-lib/lib/libalpm/versioncmp.h Fri Feb 9 16:54:57 2007 @@ -27,7 +27,7 @@ #include "package.h" int _alpm_depcmp(pmpkg_t *pkg, pmdepend_t *dep); -int _alpm_versioncmp(const char *a, const char *b) +int _alpm_versioncmp(const char *a, const char *b); #endif Index: pacman-lib/src/pacman/po/.cvsignore diff -u pacman-lib/src/pacman/po/.cvsignore:1.2 pacman-lib/src/pacman/po/.cvsignore:1.3 --- pacman-lib/src/pacman/po/.cvsignore:1.2 Thu Feb 8 00:36:26 2007 +++ pacman-lib/src/pacman/po/.cvsignore Fri Feb 9 16:54:57 2007 @@ -3,6 +3,4 @@ *.gmo POTFILES stamp-po - -remove-potcdate.sin remove-potcdate.sed Index: pacman-lib/src/util/.cvsignore diff -u pacman-lib/src/util/.cvsignore:1.1 pacman-lib/src/util/.cvsignore:1.2 --- pacman-lib/src/util/.cvsignore:1.1 Mon Mar 27 12:17:36 2006 +++ pacman-lib/src/util/.cvsignore Fri Feb 9 16:54:58 2007 @@ -2,5 +2,4 @@ .libs Makefile Makefile.in -convertdb vercmp

1 0

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

09 Feb '07

Date: Friday, February 9, 2007 @ 16:08:12 Author: aaron Path: /home/cvs-pacman/pacman-lib/src/util Modified: vercmp.c (1.6 -> 1.7) * I made "alpm_versioncmp" public a while back, without noticing this was already done (alpm_pkg_vercmp). I dropped this change, making versioncmp "private" again. (alpm_versioncmp -> _alpm_versioncmp, hidden symbol) * Make alpm_get_upgrades use the same version check that -Su and -S use. ----------+ vercmp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: pacman-lib/src/util/vercmp.c diff -u pacman-lib/src/util/vercmp.c:1.6 pacman-lib/src/util/vercmp.c:1.7 --- pacman-lib/src/util/vercmp.c:1.6 Tue Jan 30 02:47:20 2007 +++ pacman-lib/src/util/vercmp.c Fri Feb 9 16:08:12 2007 @@ -45,7 +45,7 @@ return(0); } - ret = alpm_versioncmp(s1, s2); + ret = alpm_pkg_vercmp(s1, s2); printf("%d\n", ret); return(ret); }

1 0