- Pacman-dev - lists.archlinux.org

[pacman-dev] CVS update of pacman-lib/src/pacman (5 files)
by dan＠archlinux.org 01 Feb '07

01 Feb '07

Date: Thursday, February 1, 2007 @ 01:35:30 Author: dan Path: /home/cvs-pacman/pacman-lib/src/pacman Modified: add.c (1.27 -> 1.28) remove.c (1.27 -> 1.28) sync.c (1.105 -> 1.106) util.c (1.24 -> 1.25) util.h (1.13 -> 1.14) * Tried to clean up newline display a bit in the frontend. * Removed useless buildstring function from util.h; replaced all calls of it with list_display. * Made list_display output 2 spaces instead of 1 between each item. ----------+ add.c | 3 ++- remove.c | 3 ++- sync.c | 14 +++++--------- util.c | 32 +++----------------------------- util.h | 1 - 5 files changed, 12 insertions(+), 41 deletions(-) Index: pacman-lib/src/pacman/add.c diff -u pacman-lib/src/pacman/add.c:1.27 pacman-lib/src/pacman/add.c:1.28 --- pacman-lib/src/pacman/add.c:1.27 Wed Jan 31 01:10:22 2007 +++ pacman-lib/src/pacman/add.c Thu Feb 1 01:35:30 2007 @@ -76,12 +76,13 @@ MSG(NL, _("loading package data... ")); for(i = targets; i; i = i->next) { if(alpm_trans_addtarget(i->data) == -1) { + MSG(NL, "\n"); ERR(NL, _("failed to add target '%s' (%s)\n"), (char *)i->data, alpm_strerror(pm_errno)); retval = 1; goto cleanup; } } - MSG(CL, _("done.")); + MSG(CL, _("done.\n")); /* Step 2: "compute" the transaction based on targets and flags */ Index: pacman-lib/src/pacman/remove.c diff -u pacman-lib/src/pacman/remove.c:1.27 pacman-lib/src/pacman/remove.c:1.28 --- pacman-lib/src/pacman/remove.c:1.27 Wed Jan 31 01:10:22 2007 +++ pacman-lib/src/pacman/remove.c Thu Feb 1 01:35:30 2007 @@ -121,7 +121,8 @@ pmpkg_t *pkg = alpm_list_getdata(i); lst = alpm_list_add(lst, strdup(alpm_pkg_get_name(pkg))); } - list_display(_("\nTargets:"), lst); + MSG(NL, "\n"); + list_display(_("Targets:"), lst); FREELIST(lst); /* get confirmation */ if(yesno(_("\nDo you want to remove these packages? [Y/n] ")) == 0) { Index: pacman-lib/src/pacman/sync.c diff -u pacman-lib/src/pacman/sync.c:1.105 pacman-lib/src/pacman/sync.c:1.106 --- pacman-lib/src/pacman/sync.c:1.105 Wed Jan 31 03:30:15 2007 +++ pacman-lib/src/pacman/sync.c Thu Feb 1 01:35:30 2007 @@ -292,6 +292,7 @@ pmgrp_t *grp = alpm_db_readgrp(db, grpname); if(grp) { + /* TODO this should be a lot cleaner, why two outputs? */ MSG(NL, "%s\n", (char *)alpm_grp_get_name(grp)); list_display(" ", alpm_grp_get_packages(grp)); } @@ -659,12 +660,9 @@ list_install = alpm_list_add(list_install, str); } if(list_remove) { - MSG(NL, _("\nRemove: ")); - str = buildstring(list_remove); - indentprint(str, 9); - MSG(CL, "\n"); + MSG(NL, "\n"); /* TODO ugly hack. printing a single NL should be easy */ + list_display(_("Remove:"), list_remove); FREELIST(list_remove); - FREE(str); } mb = (double)(totalsize / 1048576.0); umb = (double)(totalisize / 1048576.0); @@ -675,15 +673,13 @@ if(umb > 0 && umb < 0.1) { umb = 0.1; } - MSG(NL, _("\nTargets: ")); - str = buildstring(list_install); - indentprint(str, 9); + 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); - FREE(str); if(config->op_s_downloadonly) { if(config->noconfirm) { Index: pacman-lib/src/pacman/util.c diff -u pacman-lib/src/pacman/util.c:1.24 pacman-lib/src/pacman/util.c:1.25 --- pacman-lib/src/pacman/util.c:1.24 Thu Jan 25 21:13:16 2007 +++ pacman-lib/src/pacman/util.c Thu Feb 1 01:35:30 2007 @@ -194,32 +194,6 @@ } } -/* Condense a list of strings into one long (space-delimited) string - */ -char *buildstring(alpm_list_t *strlist) -{ - char *str; - size_t size = 1; - alpm_list_t *i; - - for(i = strlist; i; i = alpm_list_next(i)) { - size += strlen(alpm_list_getdata(i)) + 1; - } - str = (char *)malloc(size); - if(str == NULL) { - ERR(NL, _("failed to allocate %d bytes\n"), size); - } - str[0] = '\0'; - for(i = strlist; i; i = alpm_list_next(i)) { - strcat(str, alpm_list_getdata(i)); - strcat(str, " "); - } - /* shave off the last space */ - str[strlen(str)-1] = '\0'; - - return(str); -} - /* Convert a string to uppercase */ char *strtoupper(char *str) @@ -265,17 +239,17 @@ if(list) { for(i = list, cols = len; i; i = alpm_list_next(i)) { char *str = alpm_list_getdata(i); - int s = strlen(str)+1; + int s = strlen(str) + 2; unsigned int maxcols = getcols(); if(s + cols >= maxcols) { int i; cols = len; printf("\n"); - for (i = 0; i < len+1; ++i) { + for (i = 0; i <= len; ++i) { printf(" "); } } - printf("%s ", str); + printf("%s ", str); cols += s; } printf("\n"); Index: pacman-lib/src/pacman/util.h diff -u pacman-lib/src/pacman/util.h:1.13 pacman-lib/src/pacman/util.h:1.14 --- pacman-lib/src/pacman/util.h:1.13 Fri Jan 19 04:28:47 2007 +++ pacman-lib/src/pacman/util.h Thu Feb 1 01:35:30 2007 @@ -52,7 +52,6 @@ int makepath(char *path); int rmrf(char *path); void indentprint(const char *str, unsigned int indent); -char *buildstring(alpm_list_t *strlist); char *strtoupper(char *str); char *strtrim(char *str); int reg_match(char *string, char *pattern);

1 0

[pacman-dev] CVS update of pacman-lib/etc/pacman.d (mirrorlist.in)
by dan＠archlinux.org 01 Feb '07

01 Feb '07

Date: Wednesday, January 31, 2007 @ 23:12:58 Author: dan Path: /home/cvs-pacman/pacman-lib/etc/pacman.d Modified: mirrorlist.in (1.2 -> 1.3) Added mirror in Finland to mirrorlist ---------------+ mirrorlist.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) Index: pacman-lib/etc/pacman.d/mirrorlist.in diff -u pacman-lib/etc/pacman.d/mirrorlist.in:1.2 pacman-lib/etc/pacman.d/mirrorlist.in:1.3 --- pacman-lib/etc/pacman.d/mirrorlist.in:1.2 Thu Dec 28 12:13:12 2006 +++ pacman-lib/etc/pacman.d/mirrorlist.in Wed Jan 31 23:12:58 2007 @@ -19,12 +19,13 @@ Server = ftp://ftp.sh.cvut.cz/MIRRORS/arch/@@REPO@@/os/@CARCH@ # - Estonia Server = ftp://ftp.estpak.ee/pub/archlinux/@@REPO@@/os/@CARCH@ +# - Finland +Server = ftp://ftp.sixnix.net/pub/archlinux/@@REPO@@/os/@CARCH@ # - France Server = ftp://ftp.rez-gif.supelec.fr/pub/Linux/distrib/archlinux/@@REPO@@/os/@CARCH@ Server = ftp://mir1.archlinuxfr.org/archlinux/@@REPO@@/os/@CARCH@ Server = ftp://mir2.archlinuxfr.org/archlinux/@@REPO@@/os/@CARCH@ Server = ftp://distrib-coffee.ipsl.jussieu.fr/pub/linux/archlinux/@@REPO@@/os/@CARCH@ -#Server = http://mirrors.jakimowicz.com/archlinux/@@REPO@@/os/@CARCH@ # - Germany Server = ftp://ftp.tu-chemnitz.de/pub/linux/sunsite.unc-mirror/distributions/archlinux/@@REPO@@/os/@CARCH@ Server = ftp://ftp.hosteurope.de/mirror/ftp.archlinux.org/@@REPO@@/os/@CARCH@

1 0

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

01 Feb '07

Date: Wednesday, January 31, 2007 @ 22:31:47 Author: aaron Path: /home/cvs-pacman/pacman-lib/lib/libalpm Modified: server.c (1.18 -> 1.19) sync.c (1.96 -> 1.97) * Minor output fix (move colon so it's not part of the URL) * Added ldconfig on --sync operations too ----------+ server.c | 2 +- sync.c | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) Index: pacman-lib/lib/libalpm/server.c diff -u pacman-lib/lib/libalpm/server.c:1.18 pacman-lib/lib/libalpm/server.c:1.19 --- pacman-lib/lib/libalpm/server.c:1.18 Tue Jan 30 03:14:11 2007 +++ pacman-lib/lib/libalpm/server.c Wed Jan 31 22:31:46 2007 @@ -187,7 +187,7 @@ } if(downloadLastErrCode != 0 || dlf == NULL) { - _alpm_log(PM_LOG_ERROR, _("failed retrieving file '%s' from %s://%s: %s"), fn, + _alpm_log(PM_LOG_ERROR, _("failed retrieving file '%s' from %s://%s : %s"), fn, server->s_url->scheme, server->s_url->host, downloadLastErrString); if(localf != NULL) { fclose(localf); Index: pacman-lib/lib/libalpm/sync.c diff -u pacman-lib/lib/libalpm/sync.c:1.96 pacman-lib/lib/libalpm/sync.c:1.97 --- pacman-lib/lib/libalpm/sync.c:1.96 Wed Jan 31 01:10:21 2007 +++ pacman-lib/lib/libalpm/sync.c Wed Jan 31 22:31:46 2007 @@ -1079,6 +1079,13 @@ unlink(i->data); } } + + /* run ldconfig if it exists */ + if(handle->trans->state != STATE_INTERRUPTED) { + _alpm_log(PM_LOG_DEBUG, _("running \"ldconfig -r %s\""), handle->root); + _alpm_ldconfig(handle->root); + } + return(0); error:

1 0

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

01 Feb '07

Date: Wednesday, January 31, 2007 @ 22:00:35 Author: aaron Path: /home/cvs-pacman/pacman-lib/lib/libalpm Modified: package.c (1.54 -> 1.55) Loading package data from a file was ALWAYS generating the filelist, instead of using the in-package one. This is now fixed, and an autogenerated one is used as a last resort. This fixes the bug where /.CHANGELOG showed up in -Ql. -----------+ package.c | 39 ++++++++++++++++++++++----------------- 1 file changed, 22 insertions(+), 17 deletions(-) Index: pacman-lib/lib/libalpm/package.c diff -u pacman-lib/lib/libalpm/package.c:1.54 pacman-lib/lib/libalpm/package.c:1.55 --- pacman-lib/lib/libalpm/package.c:1.54 Wed Jan 31 20:51:12 2007 +++ pacman-lib/lib/libalpm/package.c Wed Jan 31 22:00:34 2007 @@ -241,11 +241,12 @@ int config = 0; int filelist = 0; int scriptcheck = 0; - register struct archive *archive; + struct archive *archive; struct archive_entry *entry; pmpkg_t *info = NULL; char *descfile = NULL; int fd = -1; + alpm_list_t *all_files = NULL; ALPM_LOG_FUNC; @@ -272,11 +273,14 @@ * from a libarchive archive, it can be done by reading * directly from the archive */ for(i = 0; archive_read_next_header (archive, &entry) == ARCHIVE_OK; i++) { + const char *entry_name = archive_entry_pathname(entry); + if(config && filelist && scriptcheck) { /* we have everything we need */ break; } - if(strcmp(archive_entry_pathname (entry), ".PKGINFO") == 0) { + + if(strcmp(entry_name, ".PKGINFO") == 0) { /* extract this file into /tmp. it has info for us */ descfile = strdup("/tmp/alpm_XXXXXX"); fd = mkstemp(descfile); @@ -299,10 +303,10 @@ FREE(descfile); close(fd); continue; - } else if(strcmp(archive_entry_pathname (entry), ".INSTALL") == 0) { + } else if(strcmp(entry_name, ".INSTALL") == 0) { info->scriptlet = 1; scriptcheck = 1; - } else if(strcmp(archive_entry_pathname (entry), ".FILELIST") == 0) { + } else if(strcmp(entry_name, ".FILELIST") == 0) { /* Build info->files from the filelist */ FILE *fp; char *fn; @@ -314,7 +318,7 @@ } fn = strdup("/tmp/alpm_XXXXXX"); fd = mkstemp(fn); - archive_read_data_into_fd (archive,fd); + archive_read_data_into_fd(archive,fd); fp = fopen(fn, "r"); while(!feof(fp)) { if(fgets(str, PATH_MAX, fp) == NULL) { @@ -334,28 +338,29 @@ continue; } else { scriptcheck = 1; - if(!filelist) { - /* no .FILELIST present in this package.. build the filelist the */ - /* old-fashioned way, one at a time */ - expath = strdup(archive_entry_pathname (entry)); - info->files = alpm_list_add(info->files, expath); - } + /* Keep track of all files so we can generate a filelist later if missing */ + all_files = alpm_list_add(all_files, strdup(entry_name)); } - if(archive_read_data_skip (archive)) { + if(archive_read_data_skip(archive)) { _alpm_log(PM_LOG_ERROR, _("bad package file in %s"), pkgfile); goto error; } expath = NULL; } - archive_read_finish (archive); + archive_read_finish(archive); if(!config) { _alpm_log(PM_LOG_ERROR, _("missing package info file in %s"), pkgfile); goto error; - } else if(!filelist) { - _alpm_log(PM_LOG_ERROR, _("missing package filelist in %s"), pkgfile); - goto error; + } + + if(!filelist) { + _alpm_log(PM_LOG_ERROR, _("missing package filelist in %s, generating one"), pkgfile); + info->files = all_files; + } else { + alpm_list_free_inner(all_files, free); + alpm_list_free(all_files); } /* internal */ @@ -376,7 +381,7 @@ } error: FREEPKG(info); - archive_read_finish (archive); + archive_read_finish(archive); return(NULL); }

1 0

[pacman-dev] CVS update of pacman-lib/scripts (makepkg)
by Aaron Griffin 01 Feb '07

01 Feb '07

Date: Wednesday, January 31, 2007 @ 21:34:03 Author: aaron Path: /home/cvs-pacman/pacman-lib/scripts Modified: makepkg (1.39 -> 1.40) It appears I misunderstood what this bash-ism did ---------+ makepkg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: pacman-lib/scripts/makepkg diff -u pacman-lib/scripts/makepkg:1.39 pacman-lib/scripts/makepkg:1.40 --- pacman-lib/scripts/makepkg:1.39 Wed Jan 31 21:12:49 2007 +++ pacman-lib/scripts/makepkg Wed Jan 31 21:34:03 2007 @@ -927,7 +927,7 @@ cd "$startdir/pkg" pkg_file="$PKGDEST/$pkgname-$pkgver-$pkgrel-${CARCH}.${PKGEXT}" -comp_files=".PKGINFO .FILELIST .INSTALL" +comp_files=".PKGINFO .FILELIST ${install:+.INSTALL}" [ $have_changelog -eq 1 ] && comp_files=".CHANGELOG $comp_files" if ! tar czf $pkg_file $comp_files *; then

1 0

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

01 Feb '07

Date: Wednesday, January 31, 2007 @ 21:29:07 Author: aaron Path: /home/cvs-pacman/pacman-lib/lib/libalpm Modified: add.c (1.109 -> 1.110) Cleaned up some of the metadata control -------+ add.c | 26 +++++++++----------------- 1 file changed, 9 insertions(+), 17 deletions(-) Index: pacman-lib/lib/libalpm/add.c diff -u pacman-lib/lib/libalpm/add.c:1.109 pacman-lib/lib/libalpm/add.c:1.110 --- pacman-lib/lib/libalpm/add.c:1.109 Wed Jan 31 01:10:21 2007 +++ pacman-lib/lib/libalpm/add.c Wed Jan 31 21:29:07 2007 @@ -504,25 +504,17 @@ PROGRESS(trans, cb_state, what, (int)(percent * 100), alpm_list_count(trans->packages), (alpm_list_count(trans->packages) - alpm_list_count(targ) +1)); } - if(!strcmp(pathname, ".PKGINFO") || !strcmp(pathname, ".FILELIST")) { + if(strcmp(pathname, ".PKGINFO") == 0 || strcmp(pathname, ".FILELIST") == 0) { archive_read_data_skip (archive); continue; - } - - /*if(!strcmp(pathname, "._install") || !strcmp(pathname, ".INSTALL")) { - * the install script goes inside the db - * snprintf(expath, PATH_MAX, "%s/%s-%s/install", db->path, info->name, info->version); */ - if(!strcmp(pathname, "._install") || !strcmp(pathname, ".INSTALL") || - !strcmp(pathname, ".CHANGELOG")) { - if(!strcmp(pathname, ".CHANGELOG")) { - /* the changelog goes inside the db */ - snprintf(expath, PATH_MAX, "%s/%s-%s/changelog", db->path, - info->name, info->version); - } else { - /* the install script goes inside the db */ - snprintf(expath, PATH_MAX, "%s/%s-%s/install", db->path, - info->name, info->version); - } + } else if(strcmp(pathname, ".INSTALL") == 0) { + /* the install script goes inside the db */ + snprintf(expath, PATH_MAX, "%s/%s-%s/install", db->path, + info->name, info->version); + } else if(strcmp(pathname, ".CHANGELOG") == 0) { + /* the changelog goes inside the db */ + snprintf(expath, PATH_MAX, "%s/%s-%s/changelog", db->path, + info->name, info->version); } else { /* build the new pathname relative to handle->root */ snprintf(expath, PATH_MAX, "%s%s", handle->root, pathname);

1 0

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

01 Feb '07

Date: Wednesday, January 31, 2007 @ 21:16:14 Author: aaron Path: /home/cvs-pacman/pacman-lib/src/pacman Modified: package.c (1.25 -> 1.26) -Ql needs the 'root' prepended to each file -----------+ package.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) Index: pacman-lib/src/pacman/package.c diff -u pacman-lib/src/pacman/package.c:1.25 pacman-lib/src/pacman/package.c:1.26 --- pacman-lib/src/pacman/package.c:1.25 Mon Jan 29 23:15:14 2007 +++ pacman-lib/src/pacman/package.c Wed Jan 31 21:16:13 2007 @@ -203,7 +203,8 @@ pkgfiles = alpm_pkg_get_files(pkg); for(i = pkgfiles; i; i = alpm_list_next(i)) { - fprintf(stdout, "%s %s\n", (char *)pkgname, (char *)alpm_list_getdata(i)); + fprintf(stdout, "%s %s%s\n", pkgname, alpm_option_get_root(), + (char *)alpm_list_getdata(i)); } fflush(stdout);

1 0

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

01 Feb '07

Date: Wednesday, January 31, 2007 @ 21:12:49 Author: dan Path: /home/cvs-pacman/pacman-lib/scripts Modified: makepkg (1.38 -> 1.39) This removes the warning about skipping dependency checking when the user is either generating the md5sums, repackaging, or just downloading and extracting. The patch is below. ~ Jamie / yankees26 Signed-off-by: James Rosten <seinfeld90(a)gmail.com> ---------+ makepkg | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) Index: pacman-lib/scripts/makepkg diff -u pacman-lib/scripts/makepkg:1.38 pacman-lib/scripts/makepkg:1.39 --- pacman-lib/scripts/makepkg:1.38 Wed Jan 31 21:02:45 2007 +++ pacman-lib/scripts/makepkg Wed Jan 31 21:12:49 2007 @@ -524,7 +524,10 @@ unset deplist makedeplist # fix flyspray bug #5973 if [ "$NODEPS" = "1" -o "$GENINTEG" = "1" -o "$NOBUILD" = "1" -o "$REPKG" = "1" ]; then - warning "skipping dependency checks" + if [ "$NODEPS" = "1" ]; then + warning "skipping dependency checks" + fi + # skip printing a warning message for the others: geninteg, nobuild, repkg elif [ $(type -p pacman) ]; then msg "Checking Runtime Dependencies..." deplist=$(checkdeps ${depends[@]})

1 0

[pacman-dev] makepkg skip deps warning
by James Rosten 01 Feb '07

01 Feb '07

This removes the warning about skipping dependency checking when the user is either generating the md5sums, repackaging, or just downloading and extracting. The patch is below. ~ Jamie / yankees26 Signed-off-by: James Rosten <seinfeld90(a)gmail.com> # # old_revision [3498d7019151c435522f9e5e16086802c47817b7] # # patch "scripts/makepkg" # from [1a46635579e41cba0a1b90026f229ae572ebcbce] # to [37d27ab59d685c584be7b23a352d0fd9201518fb] # ============================================================ --- scripts/makepkg 1a46635579e41cba0a1b90026f229ae572ebcbce +++ scripts/makepkg 37d27ab59d685c584be7b23a352d0fd9201518fb @@ -524,7 +524,9 @@ if [ "$NODEPS" = "1" -o "$GENINTEG" = "1 unset deplist makedeplist # fix flyspray bug #5973 if [ "$NODEPS" = "1" -o "$GENINTEG" = "1" -o "$NOBUILD" = "1" -o "$REPKG" = "1" ]; then - warning "skipping dependency checks" + if [ "$GENINTEG" != "1" -a "$NOBUILD" != "1" -a "$REPKG" != "1" ]; then + warning "skipping dependency checks" + fi elif [ $(type -p pacman) ]; then msg "Checking Runtime Dependencies..." deplist=$(checkdeps ${depends[@]})

1 0

[pacman-dev] CVS update of pacman-lib/scripts (makepkg)
by Aaron Griffin 01 Feb '07

01 Feb '07

Date: Wednesday, January 31, 2007 @ 21:02:45 Author: aaron Path: /home/cvs-pacman/pacman-lib/scripts Modified: makepkg (1.37 -> 1.38) install scriptlet is _always_ .INSTALL ---------+ makepkg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: pacman-lib/scripts/makepkg diff -u pacman-lib/scripts/makepkg:1.37 pacman-lib/scripts/makepkg:1.38 --- pacman-lib/scripts/makepkg:1.37 Wed Jan 31 20:59:26 2007 +++ pacman-lib/scripts/makepkg Wed Jan 31 21:02:45 2007 @@ -924,7 +924,7 @@ cd "$startdir/pkg" pkg_file="$PKGDEST/$pkgname-$pkgver-$pkgrel-${CARCH}.${PKGEXT}" -comp_files=".PKGINFO .FILELIST ${install:+.INSTALL}" +comp_files=".PKGINFO .FILELIST .INSTALL" [ $have_changelog -eq 1 ] && comp_files=".CHANGELOG $comp_files" if ! tar czf $pkg_file $comp_files *; then

1 0