- Pacman-dev - lists.archlinux.org

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

12 Feb '07

Date: Monday, February 12, 2007 @ 04:28:36 Author: aaron Path: /home/cvs-pacman/pacman-lib/scripts Modified: makeworld (1.7 -> 1.8) Added changes from Daniel YC Lin via bug #3266 - support for the 'BCemno' makepkg options -----------+ makeworld | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) Index: pacman-lib/scripts/makeworld diff -u pacman-lib/scripts/makeworld:1.7 pacman-lib/scripts/makeworld:1.8 --- pacman-lib/scripts/makeworld:1.7 Tue Jan 30 00:41:13 2007 +++ pacman-lib/scripts/makeworld Mon Feb 12 04:28:36 2007 @@ -25,16 +25,20 @@ usage() { echo "makeworld version $version" - echo - echo "Usage: $0 [options] <destdir> <category> [category] ..." - echo - echo "Options:" + echo "usage: $0 [options] <destdir> <category> [category] ..." + echo "options:" echo " -b, --builddeps Build missing dependencies from source" + echo " -B, --noccache Do not use ccache during build" echo " -c, --clean Clean up work files after build" + echo " -C, --cleancache Clean up source files from the cache" echo " -d, --nodeps Skip all dependency checks" + echo " -e, --noextract Do not extract source files (use existing src/ dir)" echo " -f, --force Overwrite existing packages" echo " -i, --install Install package after successful build" + echo " -m, --nocolor Disable colorized output messages" + echo " -n, --nostrip Do not strip binaries/libraries" echo " -h, --help This help" + echo " -o, --nobuild Download and extract files only" echo " -r, --rmdeps Remove installed dependencies after a successful build" echo " -s, --syncdeps Install missing dependencies with pacman" echo " -S, --sudosync Install missing dependencies with pacman and sudo" @@ -79,16 +83,22 @@ exit 1 ;; -*) - while getopts "chisSbdfr-" opt; do + while getopts "chisSbdfrBCemnoS-" opt; do case $opt in c) MAKEPKG_OPTS="$MAKEPKG_OPTS -c" ;; i) MAKEPKG_OPTS="$MAKEPKG_OPTS -i" ;; s) MAKEPKG_OPTS="$MAKEPKG_OPTS -s" ;; - S) MAKEPKG_OPTS="$MAKEPKG_OPTS -S" ;; b) MAKEPKG_OPTS="$MAKEPKG_OPTS -b" ;; d) MAKEPKG_OPTS="$MAKEPKG_OPTS -d" ;; f) MAKEPKG_OPTS="$MAKEPKG_OPTS -f" ;; r) MAKEPKG_OPTS="$MAKEPKG_OPTS -r" ;; + B) MAKEPKG_OPTS="$MAKEPKG_OPTS -B" ;; + C) MAKEPKG_OPTS="$MAKEPKG_OPTS -C" ;; + e) MAKEPKG_OPTS="$MAKEPKG_OPTS -e" ;; + m) MAKEPKG_OPTS="$MAKEPKG_OPTS -m" ;; + n) MAKEPKG_OPTS="$MAKEPKG_OPTS -n" ;; + o) MAKEPKG_OPTS="$MAKEPKG_OPTS -o" ;; + S) MAKEPKG_OPTS="$MAKEPKG_OPTS -S" ;; h) usage exit 0

1 0

[pacman-dev] PKGBUILD style (was Re: CVS update of pacman-lib (TODO.dan doc/PKGBUILD.5 scripts/rankmirrors))
by Roman Kyrylych 12 Feb '07

12 Feb '07

2007/2/12, dan(a)archlinux.org <dan(a)archlinux.org>: > Date: Sunday, February 11, 2007 @ 20:08:35 > Author: dan > Path: /home/cvs-pacman/pacman-lib > > Modified: TODO.dan (1.7 -> 1.8) doc/PKGBUILD.5 (1.6 -> 1.7) > scripts/rankmirrors (1.4 -> 1.5) > > * Unified description of arch variable. Recommend using single quotes in > the array, e.g. arch=('i686'). I think there should be same recommendations for all variables in PKGBUILD, because now many contributors use very different style. -- Roman Kyrylych (Роман Кирилич)

1 0

[pacman-dev] Latest RC 2007.02.12
by Aaron Griffin 12 Feb '07

12 Feb '07

I changed the version numbering, but this is momentary really. This is the latest RC fixing all (hopefully) the issues we had before. URL: http://archlinux.org/~aaron/pacman/pacman-rc-2007.02.12-1-i686.pkg.tar.gz Some new "fixes" that I thought I should mention: * install/upgrade progress bars never actually worked. They do now. * display issues and duplications should all be fixed (sorry) * gensync and updatesync have been changed (gensync3 and updatesync3) * download progress only displays the package NAME for package downloads, it looks better this way. Also, names that are too long are truncated with "..." * Added --cachedir commandline param, that was never there before (though --root and --dbpath were) * Fixed pacman's "deptest" functionality as non-root (for use in makepkg) * Added a "testpkg" binary that allows you to test the validity of a package. * Numerous documentation and makepkg fixes, from Dan (I'll let him explain what is important and what is not). Currently, we are a bit behind on the schedule I posted a while back. At least this isn't like a real job where that means working unpaid overtime, heh. I'd like to get as much testing done as possible. By tomorrow evening, or Tuesday even, I'd like to give a public URL to the normal users who aren't part of this list (lets face it, not many are). So, please do whatever testing you can. Bugcatcher is here: http://bugs.archlinux.org/task/6316 Enjoy!

1 0

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

12 Feb '07

Date: Monday, February 12, 2007 @ 02:23:36 Author: aaron Path: /home/cvs-pacman/pacman-lib/src/pacman Modified: pacman.c (1.93 -> 1.94) Exit status of 2 seems wrong for -V ----------+ pacman.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: pacman-lib/src/pacman/pacman.c diff -u pacman-lib/src/pacman/pacman.c:1.93 pacman-lib/src/pacman/pacman.c:1.94 --- pacman-lib/src/pacman/pacman.c:1.93 Mon Feb 12 02:03:08 2007 +++ pacman-lib/src/pacman/pacman.c Mon Feb 12 02:23:36 2007 @@ -405,7 +405,7 @@ } if(config->version) { version(); - return(2); + return(0); } while(optind < argc) {

1 0

[pacman-dev] CVS update of pacman-lib (TODO.dan src/util/.cvsignore)
by dan＠archlinux.org 12 Feb '07

12 Feb '07

Date: Monday, February 12, 2007 @ 02:03:43 Author: dan Path: /home/cvs-pacman/pacman-lib Modified: TODO.dan (1.8 -> 1.9) src/util/.cvsignore (1.2 -> 1.3) TODO update and .cvsignore addition ---------------------+ TODO.dan | 5 +++-- src/util/.cvsignore | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) Index: pacman-lib/TODO.dan diff -u pacman-lib/TODO.dan:1.8 pacman-lib/TODO.dan:1.9 --- pacman-lib/TODO.dan:1.8 Sun Feb 11 20:08:35 2007 +++ pacman-lib/TODO.dan Mon Feb 12 02:03:43 2007 @@ -40,8 +40,9 @@ Go through options list. Decide if namings are good, all options are still relevant, etc. Ideas for -Re (#6273), changing meaning of -c (has two meanings, -another FS bug), etc. Remove the -A flag and possibly -D, -T, and -Y if they -can be done by other actions. Possible switch of -U --> -I (#5571). +another FS bug), etc. Remove the -A flag and possibly -D, -T, and -Y (-Y is +killed now in favor of vercmp binary) if they can be done by other actions. +Possible switch of -U --> -I (#5571). Rewrite _alpm_sortbydeps to use Topological Sort. Should work using a standard topo sort algorithm, once the crazy types can be fixed up a bit. Include a Index: pacman-lib/src/util/.cvsignore diff -u pacman-lib/src/util/.cvsignore:1.2 pacman-lib/src/util/.cvsignore:1.3 --- pacman-lib/src/util/.cvsignore:1.2 Fri Feb 9 16:54:58 2007 +++ pacman-lib/src/util/.cvsignore Mon Feb 12 02:03:43 2007 @@ -3,3 +3,4 @@ Makefile Makefile.in vercmp +testpkg

1 0

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

12 Feb '07

Date: Monday, February 12, 2007 @ 02:03:08 Author: aaron Path: /home/cvs-pacman/pacman-lib/src/pacman Modified: pacman.c (1.92 -> 1.93) * Added --cachedir commandline option * Removed usage of 'realpath'. From the manpage: "Avoid using this function. It is broken by design" ----------+ pacman.c | 96 +++++++++++++++++++++++++++++++++---------------------------- 1 file changed, 52 insertions(+), 44 deletions(-) Index: pacman-lib/src/pacman/pacman.c diff -u pacman-lib/src/pacman/pacman.c:1.92 pacman-lib/src/pacman/pacman.c:1.93 --- pacman-lib/src/pacman/pacman.c:1.92 Mon Feb 12 01:44:00 2007 +++ pacman-lib/src/pacman/pacman.c Mon Feb 12 02:03:08 2007 @@ -98,16 +98,16 @@ if(op == PM_OP_ADD) { printf(_("usage: %s {-A --add} [options] <file>\n"), myname); printf(_("options:\n")); - printf(_(" -d, --nodeps skip dependency checks\n")); - printf(_(" -f, --force force install, overwrite conflicting files\n")); + printf(_(" -d, --nodeps skip dependency checks\n")); + printf(_(" -f, --force force install, overwrite conflicting files\n")); } else if(op == PM_OP_REMOVE) { printf(_("usage: %s {-R --remove} [options] <package>\n"), myname); printf(_("options:\n")); - printf(_(" -c, --cascade remove packages and all packages that depend on them\n")); - printf(_(" -d, --nodeps skip dependency checks\n")); - printf(_(" -k, --dbonly only remove database entry, do not remove files\n")); - printf(_(" -n, --nosave remove configuration files as well\n")); - printf(_(" -s, --recursive remove dependencies also (that won't break packages)\n")); + printf(_(" -c, --cascade remove packages and all packages that depend on them\n")); + printf(_(" -d, --nodeps skip dependency checks\n")); + printf(_(" -k, --dbonly only remove database entry, do not remove files\n")); + printf(_(" -n, --nosave remove configuration files as well\n")); + printf(_(" -s, --recursive remove dependencies also (that won't break packages)\n")); } else if(op == PM_OP_UPGRADE) { if(config->flags & PM_TRANS_FLAG_FRESHEN) { printf(_("usage: %s {-F --freshen} [options] <file>\n"), myname); @@ -115,46 +115,47 @@ printf(_("usage: %s {-U --upgrade} [options] <file>\n"), myname); } printf(_("options:\n")); - printf(_(" -d, --nodeps skip dependency checks\n")); - printf(_(" -f, --force force install, overwrite conflicting files\n")); + printf(_(" -d, --nodeps skip dependency checks\n")); + printf(_(" -f, --force force install, overwrite conflicting files\n")); } else if(op == PM_OP_QUERY) { printf(_("usage: %s {-Q --query} [options] [package]\n"), myname); printf(_("options:\n")); - printf(_(" -c, --changelog view the changelog of a package\n")); - printf(_(" -e, --orphans list all packages installed as dependencies but no longer\n")); - printf(_(" required by any package\n")); - printf(_(" -g, --groups view all members of a package group\n")); - printf(_(" -i, --info view package information\n")); - printf(_(" -l, --list list the contents of the queried package\n")); - printf(_(" -m, --foreign list all packages that were not found in the sync db(s)\n")); - 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")); + printf(_(" -c, --changelog view the changelog of a package\n")); + printf(_(" -e, --orphans list all packages installed as dependencies but no longer\n")); + printf(_(" required by any package\n")); + printf(_(" -g, --groups view all members of a package group\n")); + printf(_(" -i, --info view package information\n")); + printf(_(" -l, --list list the contents of the queried package\n")); + printf(_(" -m, --foreign list all packages that were not found in the sync db(s)\n")); + 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")); - printf(_(" -c, --clean remove old packages from cache directory (use -cc for all)\n")); - printf(_(" -d, --nodeps skip dependency checks\n")); - printf(_(" -e, --dependsonly install dependencies only\n")); - printf(_(" -f, --force force install, overwrite conflicting files\n")); - printf(_(" -g, --groups view all members of a package group\n")); - printf(_(" -i, --info view package information\n")); - printf(_(" -p, --print-uris print out URIs for given packages and their dependencies\n")); - printf(_(" -s, --search search remote repositories for matching strings\n")); - printf(_(" -u, --sysupgrade upgrade all packages that are out of date\n")); - printf(_(" -w, --downloadonly download packages but do not install/upgrade anything\n")); - printf(_(" -y, --refresh download fresh package databases from the server\n")); - printf(_(" --ignore <pkg> ignore a package upgrade (can be used more than once)\n")); + printf(_(" -c, --clean remove old packages from cache directory (use -cc for all)\n")); + printf(_(" -d, --nodeps skip dependency checks\n")); + printf(_(" -e, --dependsonly install dependencies only\n")); + printf(_(" -f, --force force install, overwrite conflicting files\n")); + printf(_(" -g, --groups view all members of a package group\n")); + printf(_(" -i, --info view package information\n")); + printf(_(" -p, --print-uris print out URIs for given packages and their dependencies\n")); + printf(_(" -s, --search search remote repositories for matching strings\n")); + printf(_(" -u, --sysupgrade upgrade all packages that are out of date\n")); + printf(_(" -w, --downloadonly download packages but do not install/upgrade anything\n")); + printf(_(" -y, --refresh download fresh package databases from the server\n")); + printf(_(" --ignore <pkg> ignore a package upgrade (can be used more than once)\n")); } - printf(_(" --config <path> set an alternate configuration file\n")); - printf(_(" --noconfirm do not ask for anything confirmation\n")); - printf(_(" --ask <number> pre-specify answers for questions (see manpage)\n")); - printf(_(" --noprogressbar do not show a progress bar when downloading files\n")); - printf(_(" --noscriptlet do not execute the install scriptlet if there is any\n")); - printf(_(" -v, --verbose be verbose\n")); - printf(_(" -r, --root <path> set an alternate installation root\n")); - printf(_(" -b, --dbpath <path> set an alternate database location\n")); + printf(_(" --config <path> set an alternate configuration file\n")); + printf(_(" --noconfirm do not ask for anything confirmation\n")); + printf(_(" --ask <number> pre-specify answers for questions (see manpage)\n")); + printf(_(" --noprogressbar do not show a progress bar when downloading files\n")); + printf(_(" --noscriptlet do not execute the install scriptlet if there is any\n")); + printf(_(" -v, --verbose be verbose\n")); + printf(_(" -r, --root <path> set an alternate installation root\n")); + printf(_(" -b, --dbpath <path> set an alternate database location\n")); + printf(_(" --cachedir <dir> set an alternate database location\n")); } } @@ -257,9 +258,9 @@ {"noprogressbar", no_argument, 0, 1004}, {"noscriptlet", no_argument, 0, 1005}, {"ask", required_argument, 0, 1006}, + {"cachedir", required_argument, 0, 1007}, {0, 0, 0, 0} }; - char root[PATH_MAX]; struct stat st; unsigned short logmask; @@ -309,6 +310,13 @@ case 1004: config->noprogressbar = 1; break; case 1005: config->flags |= PM_TRANS_FLAG_NOSCRIPTLET; break; case 1006: config->noask = 1; config->ask = atoi(optarg); break; + case 1007: + if(stat(optarg, &st) == -1 || !S_ISDIR(st.st_mode)) { + ERR(NL, _("'%s' is not a valid cache directory\n"), optarg); + return(1); + } + alpm_option_set_cachedir(optarg); + break; case 'A': config->op = (config->op != PM_OP_MAIN ? 0 : PM_OP_ADD); break; case 'D': config->op = (config->op != PM_OP_MAIN ? 0 : PM_OP_DEPTEST); @@ -329,7 +337,7 @@ config->op = (config->op != PM_OP_MAIN ? 0 : PM_OP_DEPTEST); break; case 'b': - if(stat(optarg, &st) == -1 || !S_ISDIR(st.st_mode)) { + if(stat(optarg, &st) == -1 || !S_ISDIR(st.st_mode)) { ERR(NL, _("'%s' is not a valid db path\n"), optarg); return(1); } @@ -359,11 +367,11 @@ config->flags |= PM_TRANS_FLAG_PRINTURIS; break; case 'r': - if(realpath(optarg, root) == NULL) { + if(stat(optarg, &st) == -1 || !S_ISDIR(st.st_mode)) { ERR(NL, _("'%s' is not a valid root path\n"), optarg); return(1); } - alpm_option_set_root(strdup(root)); + alpm_option_set_root(optarg); break; case 's': config->op_s_search = 1;

1 0

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

12 Feb '07

Date: Monday, February 12, 2007 @ 01:44:00 Author: aaron Path: /home/cvs-pacman/pacman-lib/src/pacman Modified: conf.h (1.15 -> 1.16) deptest.c (1.13 -> 1.14) pacman.c (1.91 -> 1.92) * Removed the 'vercmp' op from pacman. The standalone 'vercmp' binary should be used instead * Allow -T/--deptest to work without root privileges -----------+ conf.h | 1 - deptest.c | 12 ------------ pacman.c | 6 ++---- 3 files changed, 2 insertions(+), 17 deletions(-) Index: pacman-lib/src/pacman/conf.h diff -u pacman-lib/src/pacman/conf.h:1.15 pacman-lib/src/pacman/conf.h:1.16 --- pacman-lib/src/pacman/conf.h:1.15 Sun Feb 4 03:26:53 2007 +++ pacman-lib/src/pacman/conf.h Mon Feb 12 01:44:00 2007 @@ -33,7 +33,6 @@ unsigned short upgrade; unsigned short noconfirm; unsigned short noprogressbar; - unsigned short op_d_vertest; unsigned short op_d_resolve; unsigned short op_q_isfile; unsigned short op_q_info; Index: pacman-lib/src/pacman/deptest.c diff -u pacman-lib/src/pacman/deptest.c:1.13 pacman-lib/src/pacman/deptest.c:1.14 --- pacman-lib/src/pacman/deptest.c:1.13 Wed Jan 31 01:10:22 2007 +++ pacman-lib/src/pacman/deptest.c Mon Feb 12 01:44:00 2007 @@ -49,18 +49,6 @@ return(0); } - if(config->op_d_vertest) { - const char *pkga, *pkgb; - pkga = alpm_list_getdata(targets); - i = alpm_list_next(targets); - if(pkga && i && (pkgb = alpm_list_getdata(i))) { - int ret = alpm_pkg_vercmp(pkga, pkgb); - printf("%d\n", ret); - return(ret); - } - return(0); - } - /* we create a transaction to hold a dummy package to be able to use * deps checkings from alpm_trans_prepare() */ if(alpm_trans_init(PM_TRANS_TYPE_ADD, 0, NULL, NULL, NULL) == -1) { Index: pacman-lib/src/pacman/pacman.c diff -u pacman-lib/src/pacman/pacman.c:1.91 pacman-lib/src/pacman/pacman.c:1.92 --- pacman-lib/src/pacman/pacman.c:1.91 Fri Feb 9 12:58:19 2007 +++ pacman-lib/src/pacman/pacman.c Mon Feb 12 01:44:00 2007 @@ -183,7 +183,7 @@ && (pm_errno == PM_ERR_TRANS_COMMITING)) { return; } - if(signum != 0 && config->op_d_vertest == 0) { + if(signum != 0) { /* TODO why is this here? */ fprintf(stderr, "\n"); } @@ -224,7 +224,6 @@ {"deptest", no_argument, 0, 'T'}, /* used by makepkg */ {"upgrade", no_argument, 0, 'U'}, {"version", no_argument, 0, 'V'}, - {"vertest", no_argument, 0, 'Y'}, /* does the same as the 'vercmp' binary */ {"dbpath", required_argument, 0, 'b'}, {"cascade", no_argument, 0, 'c'}, {"changelog", no_argument, 0, 'c'}, @@ -328,7 +327,6 @@ case 'V': config->version = 1; break; case 'Y': config->op = (config->op != PM_OP_MAIN ? 0 : PM_OP_DEPTEST); - config->op_d_vertest = 1; break; case 'b': if(stat(optarg, &st) == -1 || !S_ISDIR(st.st_mode)) { @@ -479,7 +477,7 @@ if((config->op == PM_OP_SYNC && !config->op_s_sync && (config->op_s_search || config->group || config->op_q_list || config->op_q_info || config->flags & PM_TRANS_FLAG_PRINTURIS)) - || (config->op == PM_OP_DEPTEST && !config->op_d_resolve) + || (config->op == PM_OP_DEPTEST && config->op_d_resolve) || (strcmp(alpm_option_get_root(), PM_ROOT) != 0)) { /* special case: PM_OP_SYNC can be used w/ config->op_s_search by any user */ /* special case: ignore root user check if -r is specified, fall back on

1 0

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

12 Feb '07

Date: Monday, February 12, 2007 @ 01:31:40 Author: aaron Path: /home/cvs-pacman/pacman-lib Modified: lib/libalpm/server.c (1.21 -> 1.22) Removed: config.rpath (1.1) Wasn't clearing out the 'pkgname' variable, which was causing goofy output issues - silly me. Also removed config.rpath from CVS ----------------------+ config.rpath | 614 ------------------------------------------------- lib/libalpm/server.c | 9 2 files changed, 6 insertions(+), 617 deletions(-) Index: pacman-lib/config.rpath diff -u pacman-lib/config.rpath:1.1 pacman-lib/config.rpath:removed --- pacman-lib/config.rpath:1.1 Wed Jan 24 03:51:50 2007 +++ pacman-lib/config.rpath Mon Feb 12 01:31:40 2007 @@ -1,614 +0,0 @@ -#! /bin/sh -# Output a system dependent set of variables, describing how to set the -# run time search path of shared libraries in an executable. -# -# Copyright 1996-2006 Free Software Foundation, Inc. -# Taken from GNU libtool, 2001 -# Originally by Gordon Matzigkeit <gord(a)gnu.ai.mit.edu>, 1996 -# -# This file is free software; the Free Software Foundation gives -# unlimited permission to copy and/or distribute it, with or without -# modifications, as long as this notice is preserved. -# -# The first argument passed to this file is the canonical host specification, -# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM -# or -# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM -# The environment variables CC, GCC, LDFLAGS, LD, with_gnu_ld -# should be set by the caller. -# -# The set of defined variables is at the end of this script. - -# Known limitations: -# - On IRIX 6.5 with CC="cc", the run time search patch must not be longer -# than 256 bytes, otherwise the compiler driver will dump core. The only -# known workaround is to choose shorter directory names for the build -# directory and/or the installation directory. - -# All known linkers require a `.a' archive for static linking (except MSVC, -# which needs '.lib'). -libext=a -shrext=.so - -host="$1" -host_cpu=`echo "$host" | sed 's/^$[^-]*$-$[^-]*$-$.*$$/\1/'` -host_vendor=`echo "$host" | sed 's/^$[^-]*$-$[^-]*$-$.*$$/\2/'` -host_os=`echo "$host" | sed 's/^$[^-]*$-$[^-]*$-$.*$$/\3/'` - -# Code taken from libtool.m4's _LT_CC_BASENAME. - -for cc_temp in $CC""; do - case $cc_temp in - compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; - distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; - \-*) ;; - *) break;; - esac -done -cc_basename=`echo "$cc_temp" | sed -e 's%^.*/%%'` - -# Code taken from libtool.m4's AC_LIBTOOL_PROG_COMPILER_PIC. - -wl= -if test "$GCC" = yes; then - wl='-Wl,' -else - case "$host_os" in - aix*) - wl='-Wl,' - ;; - darwin*) - case $cc_basename in - xlc*) - wl='-Wl,' - ;; - esac - ;; - mingw* | pw32* | os2*) - ;; - hpux9* | hpux10* | hpux11*) - wl='-Wl,' - ;; - irix5* | irix6* | nonstopux*) - wl='-Wl,' - ;; - newsos6) - ;; - linux*) - case $cc_basename in - icc* | ecc*) - wl='-Wl,' - ;; - pgcc | pgf77 | pgf90) - wl='-Wl,' - ;; - ccc*) - wl='-Wl,' - ;; - como) - wl='-lopt=' - ;; - *) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) - wl='-Wl,' - ;; - esac - ;; - esac - ;; - osf3* | osf4* | osf5*) - wl='-Wl,' - ;; - sco3.2v5*) - ;; - solaris*) - wl='-Wl,' - ;; - sunos4*) - wl='-Qoption ld ' - ;; - sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) - wl='-Wl,' - ;; - sysv4*MP*) - ;; - unicos*) - wl='-Wl,' - ;; - uts4*) - ;; - esac -fi - -# Code taken from libtool.m4's AC_LIBTOOL_PROG_LD_SHLIBS. - -hardcode_libdir_flag_spec= -hardcode_libdir_separator= -hardcode_direct=no -hardcode_minus_L=no - -case "$host_os" in - cygwin* | mingw* | pw32*) - # FIXME: the MSVC++ port hasn't been tested in a loooong time - # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. - if test "$GCC" != yes; then - with_gnu_ld=no - fi - ;; - interix*) - # we just hope/assume this is gcc and not c89 (= MSVC++) - with_gnu_ld=yes - ;; - openbsd*) - with_gnu_ld=no - ;; -esac - -ld_shlibs=yes -if test "$with_gnu_ld" = yes; then - # Set some defaults for GNU ld with shared library support. These - # are reset later if shared libraries are not supported. Putting them - # here allows them to be overridden if necessary. - # Unlike libtool, we use -rpath here, not --rpath, since the documented - # option of GNU ld is called -rpath, not --rpath. - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - case "$host_os" in - aix3* | aix4* | aix5*) - # On AIX/PPC, the GNU linker is very broken - if test "$host_cpu" != ia64; then - ld_shlibs=no - fi - ;; - amigaos*) - hardcode_libdir_flag_spec='-L$libdir' - hardcode_minus_L=yes - # Samuel A. Falvo II <kc5tja(a)dolphin.openprojects.net> reports - # that the semantics of dynamic libraries on AmigaOS, at least up - # to version 4, is to share data among multiple programs linked - # with the same dynamic library. Since this doesn't match the - # behavior of shared libraries on other platforms, we cannot use - # them. - ld_shlibs=no - ;; - beos*) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - : - else - ld_shlibs=no - fi - ;; - cygwin* | mingw* | pw32*) - # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. - hardcode_libdir_flag_spec='-L$libdir' - if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then - : - else - ld_shlibs=no - fi - ;; - interix3*) - hardcode_direct=no - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' - ;; - linux*) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - : - else - ld_shlibs=no - fi - ;; - netbsd*) - ;; - solaris*) - if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then - ld_shlibs=no - elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - : - else - ld_shlibs=no - fi - ;; - sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) - case `$LD -v 2>&1` in - *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*) - ld_shlibs=no - ;; - *) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`' - else - ld_shlibs=no - fi - ;; - esac - ;; - sunos4*) - hardcode_direct=yes - ;; - *) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - : - else - ld_shlibs=no - fi - ;; - esac - if test "$ld_shlibs" = no; then - hardcode_libdir_flag_spec= - fi -else - case "$host_os" in - aix3*) - # Note: this linker hardcodes the directories in LIBPATH if there - # are no directories specified by -L. - hardcode_minus_L=yes - if test "$GCC" = yes; then - # Neither direct hardcoding nor static linking is supported with a - # broken collect2. - hardcode_direct=unsupported - fi - ;; - aix4* | aix5*) - if test "$host_cpu" = ia64; then - # On IA64, the linker does run time linking by default, so we don't - # have to do anything special. - aix_use_runtimelinking=no - else - aix_use_runtimelinking=no - # Test if we are trying to use run time linking or normal - # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. - case $host_os in aix4.[23]|aix4.[23].*|aix5*) - for ld_flag in $LDFLAGS; do - if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then - aix_use_runtimelinking=yes - break - fi - done - ;; - esac - fi - hardcode_direct=yes - hardcode_libdir_separator=':' - if test "$GCC" = yes; then - case $host_os in aix4.[012]|aix4.[012].*) - collect2name=`${CC} -print-prog-name=collect2` - if test -f "$collect2name" && \ - strings "$collect2name" | grep resolve_lib_name >/dev/null - then - # We have reworked collect2 - hardcode_direct=yes - else - # We have old collect2 - hardcode_direct=unsupported - hardcode_minus_L=yes - hardcode_libdir_flag_spec='-L$libdir' - hardcode_libdir_separator= - fi - ;; - esac - fi - # Begin _LT_AC_SYS_LIBPATH_AIX. - echo 'int main () { return 0; }' > conftest.c - ${CC} ${LDFLAGS} conftest.c -o conftest - aix_libpath=`dump -H conftest 2>/dev/null | sed -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *$.*$$/\1/; p; } -}'` - if test -z "$aix_libpath"; then - aix_libpath=`dump -HX64 conftest 2>/dev/null | sed -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *$.*$$/\1/; p; } -}'` - fi - if test -z "$aix_libpath"; then - aix_libpath="/usr/lib:/lib" - fi - rm -f conftest.c conftest - # End _LT_AC_SYS_LIBPATH_AIX. - if test "$aix_use_runtimelinking" = yes; then - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - else - if test "$host_cpu" = ia64; then - hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' - else - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - fi - fi - ;; - amigaos*) - hardcode_libdir_flag_spec='-L$libdir' - hardcode_minus_L=yes - # see comment about different semantics on the GNU ld section - ld_shlibs=no - ;; - bsdi[45]*) - ;; - cygwin* | mingw* | pw32*) - # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. - # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. - hardcode_libdir_flag_spec=' ' - libext=lib - ;; - darwin* | rhapsody*) - hardcode_direct=no - if test "$GCC" = yes ; then - : - else - case $cc_basename in - xlc*) - ;; - *) - ld_shlibs=no - ;; - esac - fi - ;; - dgux*) - hardcode_libdir_flag_spec='-L$libdir' - ;; - freebsd1*) - ld_shlibs=no - ;; - freebsd2.2*) - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - ;; - freebsd2*) - hardcode_direct=yes - hardcode_minus_L=yes - ;; - freebsd* | kfreebsd*-gnu | dragonfly*) - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - ;; - hpux9*) - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' - hardcode_libdir_separator=: - hardcode_direct=yes - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - hardcode_minus_L=yes - ;; - hpux10*) - if test "$with_gnu_ld" = no; then - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' - hardcode_libdir_separator=: - hardcode_direct=yes - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - hardcode_minus_L=yes - fi - ;; - hpux11*) - if test "$with_gnu_ld" = no; then - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' - hardcode_libdir_separator=: - case $host_cpu in - hppa*64*|ia64*) - hardcode_direct=no - ;; - *) - hardcode_direct=yes - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - hardcode_minus_L=yes - ;; - esac - fi - ;; - irix5* | irix6* | nonstopux*) - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator=: - ;; - netbsd*) - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - ;; - newsos6) - hardcode_direct=yes - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator=: - ;; - openbsd*) - hardcode_direct=yes - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' - else - case "$host_os" in - openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) - hardcode_libdir_flag_spec='-R$libdir' - ;; - *) - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' - ;; - esac - fi - ;; - os2*) - hardcode_libdir_flag_spec='-L$libdir' - hardcode_minus_L=yes - ;; - osf3*) - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator=: - ;; - osf4* | osf5*) - if test "$GCC" = yes; then - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - else - # Both cc and cxx compiler support -rpath directly - hardcode_libdir_flag_spec='-rpath $libdir' - fi - hardcode_libdir_separator=: - ;; - solaris*) - hardcode_libdir_flag_spec='-R$libdir' - ;; - sunos4*) - hardcode_libdir_flag_spec='-L$libdir' - hardcode_direct=yes - hardcode_minus_L=yes - ;; - sysv4) - case $host_vendor in - sni) - hardcode_direct=yes # is this really true??? - ;; - siemens) - hardcode_direct=no - ;; - motorola) - hardcode_direct=no #Motorola manual says yes, but my tests say they lie - ;; - esac - ;; - sysv4.3*) - ;; - sysv4*MP*) - if test -d /usr/nec; then - ld_shlibs=yes - fi - ;; - sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*) - ;; - sysv5* | sco3.2v5* | sco5v6*) - hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' - hardcode_libdir_separator=':' - ;; - uts4*) - hardcode_libdir_flag_spec='-L$libdir' - ;; - *) - ld_shlibs=no - ;; - esac -fi - -# Check dynamic linker characteristics -# Code taken from libtool.m4's AC_LIBTOOL_SYS_DYNAMIC_LINKER. -libname_spec='lib$name' -case "$host_os" in - aix3*) - ;; - aix4* | aix5*) - ;; - amigaos*) - ;; - beos*) - ;; - bsdi[45]*) - ;; - cygwin* | mingw* | pw32*) - shrext=.dll - ;; - darwin* | rhapsody*) - shrext=.dylib - ;; - dgux*) - ;; - freebsd1*) - ;; - kfreebsd*-gnu) - ;; - freebsd* | dragonfly*) - ;; - gnu*) - ;; - hpux9* | hpux10* | hpux11*) - case $host_cpu in - ia64*) - shrext=.so - ;; - hppa*64*) - shrext=.sl - ;; - *) - shrext=.sl - ;; - esac - ;; - interix3*) - ;; - irix5* | irix6* | nonstopux*) - case "$host_os" in - irix5* | nonstopux*) - libsuff= shlibsuff= - ;; - *) - case $LD in - *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") libsuff= shlibsuff= ;; - *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") libsuff=32 shlibsuff=N32 ;; - *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") libsuff=64 shlibsuff=64 ;; - *) libsuff= shlibsuff= ;; - esac - ;; - esac - ;; - linux*oldld* | linux*aout* | linux*coff*) - ;; - linux*) - ;; - knetbsd*-gnu) - ;; - netbsd*) - ;; - newsos6) - ;; - nto-qnx*) - ;; - openbsd*) - ;; - os2*) - libname_spec='$name' - shrext=.dll - ;; - osf3* | osf4* | osf5*) - ;; - solaris*) - ;; - sunos4*) - ;; - sysv4 | sysv4.3*) - ;; - sysv4*MP*) - ;; - sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) - ;; - uts4*) - ;; -esac - -sed_quote_subst='s/$["`$\\]$/\\\1/g' -escaped_wl=`echo "X$wl" | sed -e 's/^X//' -e "$sed_quote_subst"` -shlibext=`echo "$shrext" | sed -e 's,^\.,,'` -escaped_hardcode_libdir_flag_spec=`echo "X$hardcode_libdir_flag_spec" | sed -e 's/^X//' -e "$sed_quote_subst"` - -LC_ALL=C sed -e 's/^$[a-zA-Z0-9_]*$=/acl_cv_\1=/' <<EOF - -# How to pass a linker flag through the compiler. -wl="$escaped_wl" - -# Static library suffix (normally "a"). -libext="$libext" - -# Shared library suffix (normally "so"). -shlibext="$shlibext" - -# Flag to hardcode \$libdir into a binary during linking. -# This must work even if \$libdir does not exist. -hardcode_libdir_flag_spec="$escaped_hardcode_libdir_flag_spec" - -# Whether we need a single -rpath flag with a separated argument. -hardcode_libdir_separator="$hardcode_libdir_separator" - -# Set to yes if using DIR/libNAME.so during linking hardcodes DIR into the -# resulting binary. -hardcode_direct="$hardcode_direct" - -# Set to yes if using the -LDIR flag during linking hardcodes DIR into the -# resulting binary. -hardcode_minus_L="$hardcode_minus_L" - -EOF Index: pacman-lib/lib/libalpm/server.c diff -u pacman-lib/lib/libalpm/server.c:1.21 pacman-lib/lib/libalpm/server.c:1.22 --- pacman-lib/lib/libalpm/server.c:1.21 Sat Feb 10 04:36:36 2007 +++ pacman-lib/lib/libalpm/server.c Mon Feb 12 01:31:39 2007 @@ -190,12 +190,15 @@ } /* 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)); + memset(pkgname, 0, PKG_NAME_LEN); + if((p = strstr(fn, PM_EXT_PKG))) { + _alpm_pkg_splitname(fn, pkgname, NULL, 1); + } if(!strlen(pkgname)) { /* just use the raw filename if we can't find crap */ - STRNCPY(pkgname, fn, PKG_NAME_LEN); + STRNCPY(pkgname, fn, PKG_NAME_LEN+1); } + _alpm_log(PM_LOG_DEBUG, _("using '%s' for download progress"), pkgname); snprintf(realfile, PATH_MAX, "%s/%s", localpath, fn); snprintf(output, PATH_MAX, "%s/%s.part", localpath, fn);

1 0

[pacman-dev] CVS update of pacman-lib/scripts (gensync updatesync)
by Aaron Griffin 12 Feb '07

12 Feb '07

Date: Monday, February 12, 2007 @ 01:07:11 Author: aaron Path: /home/cvs-pacman/pacman-lib/scripts Modified: gensync (1.12 -> 1.13) updatesync (1.8 -> 1.9) Rewrote updatesync in terms of repo-add and repo-remove ------------+ gensync | 2 updatesync | 208 ++++++++++++----------------------------------------------- 2 files changed, 45 insertions(+), 165 deletions(-) Index: pacman-lib/scripts/gensync diff -u pacman-lib/scripts/gensync:1.12 pacman-lib/scripts/gensync:1.13 --- pacman-lib/scripts/gensync:1.12 Mon Feb 12 00:49:45 2007 +++ pacman-lib/scripts/gensync Mon Feb 12 01:07:11 2007 @@ -119,7 +119,7 @@ fi done -echo "successfuly found all packages, creating repo DB..." +echo "creating repo DB..." # we'll trim the output just a tad, as gensync may be used on large repos repo-add $destfile $pkgs --force $force_pkgs \ Index: pacman-lib/scripts/updatesync diff -u pacman-lib/scripts/updatesync:1.8 pacman-lib/scripts/updatesync:1.9 --- pacman-lib/scripts/updatesync:1.8 Wed Dec 20 20:53:41 2006 +++ pacman-lib/scripts/updatesync Mon Feb 12 01:07:11 2007 @@ -21,7 +21,7 @@ # USA. # -myver='2.9.8' +myver='3.0.0' usage() { echo "updatesync $myver" @@ -47,128 +47,29 @@ exit 0 } -die() -{ - echo "updatesync: $*" >&2 - rm -rf $ustmpdir - exit 1 -} +BUILDSCRIPT="PKGBUILD" +PKGEXT="pkg.tar.gz" -check_option() { - local i - for i in ${options[@]}; do - local uc=`echo $i | tr [:lower:] [:upper:]` - local lc=`echo $i | tr [:upper:] [:lower:]` - if [ "$uc" = "$1" -o "$lc" = "$1" ]; then - echo $1 - return - fi - done -} +source /etc/makepkg.conf -get_md5checksum() -{ - if [ "$pkgdir" != "" ]; then - pkgfile="$pkgdir/$pkgname-$pkgver-$pkgrel.pkg.tar.gz" - else - pkgfile="$destdir/$pkgname-$pkgver-$pkgrel.pkg.tar.gz" - fi - if [ -f $pkgfile ]; then - md5line=`md5sum $pkgfile` - [ ! -z "$md5line" ] && pkgmd5sum=${md5line% *} - echo $pkgmd5sum - fi - return 0 +error () { + echo "==> ERROR: $*" >&2 } -db_write_entry() -{ - unset pkgname pkgver pkgrel pkgdesc force - unset groups replaces provides depends conflicts options - source $1 || return 1 - cd $ustmpdir - mkdir $pkgname-$pkgver-$pkgrel || return 1 - cd $pkgname-$pkgver-$pkgrel - # desc - : >desc - echo "%NAME%" >>desc - echo "$pkgname" >>desc - echo "" >>desc - echo "%VERSION%" >>desc - echo "$pkgver-$pkgrel" >>desc - echo "" >>desc - if [ -n "$pkgdesc" ]; then - echo "%DESC%" >>$entry - echo "$pkgdesc" >>$entry - echo "" >>$entry - fi - if [ ${#groups[*]} -gt 0 ]; then - echo "%GROUPS%" >>$entry - for it in "${groups[@]}"; do - echo "$it" >>$entry - done - echo "" >>$entry - fi - if [ -n $csize ]; then - echo "%CSIZE%" >>$entry - echo "$csize" >>$entry - echo "" >>$entry - fi - if [ ! -z $pkgmd5sum ]; then - echo "%MD5SUM%" >>$entry - echo "$pkgmd5sum" >>$entry - echo "" >>$entry - fi - if [ ${#replaces[*]} -gt 0 ]; then - echo "%REPLACES%" >>desc - for it in "${replaces[@]}"; do - echo "$it" >>desc - done - echo "" >>desc - fi - if [ "$force" = "y" -o "$force" = "Y" -o "`check_option FORCE`" ]; then - echo "%FORCE%" >>desc - echo "" >>desc - fi - # depends - : >depends - if [ ${#depends[*]} -gt 0 ]; then - echo "%DEPENDS%" >>depends - for it in "${depends[@]}"; do - echo "$it" >>depends - done - echo "" >>depends - fi - if [ ${#conflicts[*]} -gt 0 ]; then - echo "%CONFLICTS%" >>depends - for it in "${conflicts[@]}"; do - echo "$it" >>depends - done - echo "" >>depends - fi - if [ ${#provides[*]} -gt 0 ]; then - echo "%PROVIDES%" >>depends - for it in "${provides[@]}"; do - echo "$it" >>depends - done - echo "" >>depends - fi +die () { + error $* + exit 1 } -delete_entry() -{ - echo $1 | grep PKGBUILD 2>&1 >/dev/null - if [ $? -eq 0 ]; then - source $1 - else - pkgname=$1 - fi - for i in *; do - if [ "${i%-*-*}" = "$pkgname" ]; then - echo "updatesync: deleting $i" >&2 - rm -rf $i +check_force () { + local i + for i in ${options[@]}; do + local lc=$(echo $i | tr [:upper:] [:lower:]) + if [ "$lc" = "force" ]; then + true fi done + false } if [ $# -lt 3 ]; then @@ -181,71 +82,50 @@ exit 0 fi +if [ "$1" != "upd" -a "$1" != "del" ]; then + usage + exit 1 +fi + action=$1 pkgdb=$2 option=$3 -curdir="`pwd`" -pkgdir=$curdir +pkgdir="$(pwd)" if [ "$4" != "" ]; then - pkgdir=$4 + pkgdir="$4" fi +opt_force="" -if [ "$action" != "upd" -a "$action" != "del" ]; then - usage - exit 1 +if [ ! -f "$option" ]; then + die "$option not found" fi -ustmpdir=$(mktemp -d /tmp/updatesync.XXXXXXXXXX) || exit 1 +if [ "$action" = "upd" ]; then # INSERT / UPDATE + unset pkgname pkgver pkgrel options -cd $ustmpdir -if [ ! -f $pkgdb ]; then - if [ ! -f $curdir/$pkgdb ]; then - echo "updatesync: $pkgdb not found" - exit 1 - fi - pkgdb=$curdir/$pkgdb -fi + source $option || die "failed to parse $option" + pkgfile="$pkgdir/$pkgname-$pkgver-$pkgrel-$CARCH.$PKGEXT" -if [ "$action" = "upd" -a ! -f $option ]; then - if [ ! -f $curdir/$option ]; then - echo "updatesync: $option not found" - exit 1 + if [ ! -f "$pkgfile" ]; then + die "could not find $pkgname-$pkgver-$pkgrel-$CARCH.$PKGEXT - aborting" fi - option=$curdir/$option -fi -echo "updatesync: uncompressing to $ustmpdir..." >&2 -tar -xzf $pkgdb || die "error uncompressing $pkgdb" -if [ "$action" = "upd" ]; then - # INSERT / UPDATE - delete_entry $option - - source $option || die "errors parsing $option" - if [ "$pkgdir" != "" ]; then - pkgfile="$pkgdir/$pkgname-$pkgver-$pkgrel.pkg.tar.gz" - else - pkgfile="$destdir/$pkgname-$pkgver-$pkgrel.pkg.tar.gz" + if check_force; then + opt_force="--force" fi - if [ -f $pkgfile ]; then - csize=`du -b $pkgfile | cut -f1` - pkgmd5sum=`get_md5checksum $pkgfile` - [ -z $pkgmd5sum ] && die "error generating checksum for $pkgfile" - echo "updatesync: creating entry for $option" >&2 - db_write_entry $option || die "error writing entry for $option" + + repo-add "$pkgdb" $opt_force "$pkgfile" +else # DELETE + fname="$(basename $option)" + if [ "$fname" = "PKGBUILD" ]; then + unset pkgname pkgver pkgrel options + source $option else - echo "updatesync: missing package: $pkgfile" >&2 + pkgname=$1 fi -else - # DELETE - delete_entry $option -fi -echo "updatesync: compressing to $pkgdb..." >&2 -cd $ustmpdir -tar c * | gzip -9 >$pkgdb || die "error writing to $pkgdb" - -cd $curdir -rm -rf $ustmpdir + repo-remove "$pkgdb" "$pkgname" +fi exit 0 # vim: set ts=2 sw=2 noet:

1 0

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

12 Feb '07

Date: Monday, February 12, 2007 @ 00:49:45 Author: aaron Path: /home/cvs-pacman/pacman-lib/scripts Modified: gensync (1.11 -> 1.12) better error message ---------+ gensync | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: pacman-lib/scripts/gensync diff -u pacman-lib/scripts/gensync:1.11 pacman-lib/scripts/gensync:1.12 --- pacman-lib/scripts/gensync:1.11 Mon Feb 12 00:38:03 2007 +++ pacman-lib/scripts/gensync Mon Feb 12 00:49:45 2007 @@ -109,7 +109,7 @@ fi if [ ! -f "$pkgfile" ]; then - error "$BUILDSCRIPT does not have a corresponding package" + error "could not find $pkgname-$pkgver-$pkgrel-$CARCH.$PKGEXT - skipping" else if check_force; then forcepkgs="$forcepkgs $pkgfile"

1 0