- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] Introduce -D, --database
by Nagy Gabor 21 May '09

21 May '09

>From d20f84a86432bee553abdc2c485d953dc9ec6b3f Mon Sep 17 00:00:00 2001 From: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Wed, 20 May 2009 21:46:23 +0200 Subject: [PATCH] Introduce -D, --database The request of FS#12950 is implemented. On the backend side, I introduced a new function, alpm_db_set_pkgreason(), to modify the install reason of a package in the local database. On the front-end side, I introduced a new main operation, -D/--database, which has two options, --asdeps and --asexplicit. I documented this in pacman manual. I've created two pactests to test -D: database001.py and database002.py. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> --- doc/pacman.8.txt | 12 +++++- lib/libalpm/alpm.h | 16 +++++--- lib/libalpm/db.c | 34 ++++++++++++++++ pactest/tests/database001.py | 11 +++++ pactest/tests/database002.py | 11 +++++ src/pacman/Makefile.am | 1 + src/pacman/conf.h | 3 +- src/pacman/database.c | 90 ++++++++++++++++++++++++++++++++++++++++++ src/pacman/pacman.c | 22 ++++++++-- src/pacman/pacman.h | 2 + src/pacman/util.c | 2 +- 11 files changed, 189 insertions(+), 15 deletions(-) create mode 100644 pactest/tests/database001.py create mode 100644 pactest/tests/database002.py create mode 100644 src/pacman/database.c diff --git a/doc/pacman.8.txt b/doc/pacman.8.txt index e914ab4..4b7cf2d 100644 --- a/doc/pacman.8.txt +++ b/doc/pacman.8.txt @@ -28,6 +28,12 @@ front ends to be written (for instance, a GUI front end). Operations ---------- +*-D, \--database*:: + Modify the package database. This options allows you to modify certain + attributes of the installed packages in pacman's database. At the + moment, you can only change the install reason. See the '\--asdeps' + and '\--asexplicit' options below. + *-Q, \--query*:: Query the package database. This operation allows you to view installed packages and their files, as well as meta-information about individual @@ -93,13 +99,15 @@ Options Install packages non-explicitly; in other words, fake their install reason to be installed as a dependency. This is useful for makepkg and other build from source tools that need to install dependencies before building - the package. + the package. This option can be also used in combination with '-D' to + change the install reason of local packages without reinstalling. *\--asexplicit*:: Install packages explicitly; in other words, fake their install reason to be explicitly installed. This is useful if you want to mark a dependency as explicitly installed so it will not be removed by the '\--recursive' - remove operation. + remove operation. This option can be also used in combination with '-D' + to change the install reason of local packages without reinstalling. *-b, \--dbpath* <'path'>:: Specify an alternative database location (a typical default is diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 1e22a59..94c3b67 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -147,6 +147,15 @@ pmdb_t *alpm_option_get_localdb(); alpm_list_t *alpm_option_get_syncdbs(); /* + * Install reasons -- ie, why the package was installed + */ + +typedef enum _pmpkgreason_t { + PM_PKG_REASON_EXPLICIT = 0, /* explicitly requested by the user */ + PM_PKG_REASON_DEPEND = 1 /* installed as a dependency for another package */ +} pmpkgreason_t; + +/* * Databases */ @@ -169,6 +178,7 @@ alpm_list_t *alpm_db_get_pkgcache(pmdb_t *db); pmgrp_t *alpm_db_readgrp(pmdb_t *db, const char *name); alpm_list_t *alpm_db_get_grpcache(pmdb_t *db); alpm_list_t *alpm_db_search(pmdb_t *db, const alpm_list_t* needles); +int alpm_db_set_pkgreason(pmdb_t *db, const char *name, pmpkgreason_t reason); /* * Packages @@ -176,12 +186,6 @@ alpm_list_t *alpm_db_search(pmdb_t *db, const alpm_list_t* needles); /* Info parameters */ -/* reasons -- ie, why the package was installed */ -typedef enum _pmpkgreason_t { - PM_PKG_REASON_EXPLICIT = 0, /* explicitly requested by the user */ - PM_PKG_REASON_DEPEND = 1 /* installed as a dependency for another package */ -} pmpkgreason_t; - int alpm_pkg_load(const char *filename, unsigned short full, pmpkg_t **pkg); int alpm_pkg_free(pmpkg_t *pkg); int alpm_pkg_checkmd5sum(pmpkg_t *pkg); diff --git a/lib/libalpm/db.c b/lib/libalpm/db.c index 561967c..941b56d 100644 --- a/lib/libalpm/db.c +++ b/lib/libalpm/db.c @@ -319,6 +319,40 @@ alpm_list_t SYMEXPORT *alpm_db_search(pmdb_t *db, const alpm_list_t* needles) return(_alpm_db_search(db, needles)); } +/* Set install reason for a package in db + * @param db pointer to the package database + * @param name the name of the package + * @param reason the new install reason + * @return 0 on success, -1 on error (pm_errno is set accordingly) + */ +int SYMEXPORT alpm_db_set_pkgreason(pmdb_t *db, const char *name, pmpkgreason_t reason) +{ + ALPM_LOG_FUNC; + + /* Sanity checks */ + ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1)); + ASSERT(db != NULL && name != NULL, RET_ERR(PM_ERR_WRONG_ARGS, -1)); + + pmpkg_t *pkg = _alpm_db_get_pkgfromcache(db, name); + if(pkg == NULL) { + RET_ERR(PM_ERR_PKG_NOT_FOUND, -1); + } + + _alpm_log(PM_LOG_DEBUG, "setting install reason %u for %s/%s\n", reason, db->treename, name); + /* read DESC */ + if(_alpm_db_read(db, pkg, INFRQ_DESC)) { + return(-1); + } + /* set reason (in pkgcache) */ + pkg->reason = reason; + /* write DESC */ + if(_alpm_db_write(db, pkg, INFRQ_DESC)) { + return(-1); + } + + return(0); +} + /** @} */ pmdb_t *_alpm_db_new(const char *dbpath, const char *treename) diff --git a/pactest/tests/database001.py b/pactest/tests/database001.py new file mode 100644 index 0000000..de4c040 --- /dev/null +++ b/pactest/tests/database001.py @@ -0,0 +1,11 @@ +self.description = "-D --asdeps" + +lp = pmpkg("pkg") +lp.reason = 0 +self.addpkg2db("local", lp) + +self.args = "-D pkg --asdeps" + +self.addrule("PACMAN_RETCODE=0") +self.addrule("PKG_EXIST=pkg") +self.addrule("PKG_REASON=pkg|1") diff --git a/pactest/tests/database002.py b/pactest/tests/database002.py new file mode 100644 index 0000000..05fa7f4 --- /dev/null +++ b/pactest/tests/database002.py @@ -0,0 +1,11 @@ +self.description = "-D --asexplicit" + +lp = pmpkg("pkg") +lp.reason = 1 +self.addpkg2db("local", lp) + +self.args = "-D pkg --asexplicit" + +self.addrule("PACMAN_RETCODE=0") +self.addrule("PKG_EXIST=pkg") +self.addrule("PKG_REASON=pkg|0") diff --git a/src/pacman/Makefile.am b/src/pacman/Makefile.am index 220ee9c..8c14562 100644 --- a/src/pacman/Makefile.am +++ b/src/pacman/Makefile.am @@ -24,6 +24,7 @@ endif pacman_SOURCES = \ conf.h conf.c \ + database.c \ deptest.c \ package.h package.c \ pacman.h pacman.c \ diff --git a/src/pacman/conf.h b/src/pacman/conf.h index 466d983..f6cbb85 100644 --- a/src/pacman/conf.h +++ b/src/pacman/conf.h @@ -80,7 +80,8 @@ enum { PM_OP_UPGRADE, PM_OP_QUERY, PM_OP_SYNC, - PM_OP_DEPTEST + PM_OP_DEPTEST, + PM_OP_DATABASE }; /* clean method */ diff --git a/src/pacman/database.c b/src/pacman/database.c new file mode 100644 index 0000000..89ea5d9 --- /dev/null +++ b/src/pacman/database.c @@ -0,0 +1,90 @@ +/* + * database.c + * + * Copyright (c) 2002-2007 by Judd Vinet <jvinet(a)zeroflux.org> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +#include "config.h" + +#include <stdlib.h> +#include <stdio.h> +#include <string.h> + +#include <alpm.h> +#include <alpm_list.h> + +/* pacman */ +#include "pacman.h" +#include "conf.h" +#include "util.h" + +extern pmdb_t *db_local; + +/** + * @brief Modify the 'local' package database. + * + * @param targets a list of packages (as strings) to modify + * + * @return 0 on success, 1 on failure + */ +int pacman_database(alpm_list_t *targets) +{ + alpm_list_t *i; + int retval = 0; + pmpkgreason_t reason; + + if(targets == NULL) { + pm_printf(PM_LOG_ERROR, _("no targets specified (use -h for help)\n")); + return(1); + } + + if(config->flags & PM_TRANS_FLAG_ALLDEPS) { /* --asdeps */ + reason = PM_PKG_REASON_DEPEND; + } else if(config->flags & PM_TRANS_FLAG_ALLEXPLICIT) { /* --asexplicit */ + reason = PM_PKG_REASON_EXPLICIT; + } else { + pm_printf(PM_LOG_ERROR, _("no install reason specified (use -h for help)\n")); + return(1); + } + + /* Lock database */ + if(trans_init(PM_TRANS_TYPE_SYNC, 0) == -1) { + return(1); + } + + for(i = targets; i; i = alpm_list_next(i)) { + char *pkgname = i->data; + if(alpm_db_set_pkgreason(db_local, pkgname, reason)) { + pm_printf(PM_LOG_ERROR, _("could not set install reason for package %s (%s)\n"), + pkgname, alpm_strerrorlast()); + retval = 1; + } else { + if(reason == PM_PKG_REASON_DEPEND) { + printf(_("%s: install reason has been changed to 'installed as dependency'\n"), pkgname); + } else { + printf(_("%s: install reason has been changed to 'explicitly installed'\n"), pkgname); + } + } + } + + /* Unlock database */ + if(trans_release() == -1) { + return(1); + } + return(retval); +} + +/* vim: set ts=2 sw=2 noet: */ diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 3b8636c..c817828 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -75,10 +75,11 @@ static void usage(int op, const char * const myname) printf(_("operations:\n")); printf(" %s {-h --help}\n", myname); printf(" %s {-V --version}\n", myname); - printf(" %s {-Q --query} [%s] [%s]\n", myname, str_opt, str_pkg); - printf(" %s {-R --remove} [%s] <%s>\n", myname, str_opt, str_pkg); - printf(" %s {-S --sync} [%s] [%s]\n", myname, str_opt, str_pkg); - printf(" %s {-U --upgrade} [%s] <%s>\n", myname, str_opt, str_file); + printf(" %s {-D --database} <%s> <%s>\n", myname, str_opt, str_pkg); + printf(" %s {-Q --query} [%s] [%s]\n", myname, str_opt, str_pkg); + printf(" %s {-R --remove} [%s] <%s>\n", myname, str_opt, str_pkg); + printf(" %s {-S --sync} [%s] [%s]\n", myname, str_opt, str_pkg); + printf(" %s {-U --upgrade} [%s] <%s>\n", myname, str_opt, str_file); printf(_("\nuse '%s {-h --help}' with an operation for available options\n"), myname); } else { @@ -136,6 +137,11 @@ static void usage(int op, const char * const myname) printf(_(" --ignoregroup <grp>\n" " ignore a group upgrade (can be used more than once)\n")); printf(_(" -q, --quiet show less information for query and search\n")); + } else if (op == PM_OP_DATABASE) { + printf("%s: %s {-D --database} <%s> <%s>\n", str_usg, myname, str_opt, str_pkg); + printf("%s:\n", str_opt); + printf(_(" --asdeps mark packages as non-explicitly installed\n")); + printf(_(" --asexplicit mark packages as explicitly installed\n")); } printf(_(" --config <path> set an alternate configuration file\n")); printf(_(" --logfile <path> set an alternate log file\n")); @@ -326,6 +332,8 @@ static int parseargs(int argc, char *argv[]) int option_index = 0; static struct option opts[] = { + + {"database", no_argument, 0, 'D'}, {"query", no_argument, 0, 'Q'}, {"remove", no_argument, 0, 'R'}, {"sync", no_argument, 0, 'S'}, @@ -376,7 +384,7 @@ static int parseargs(int argc, char *argv[]) {0, 0, 0, 0} }; - while((opt = getopt_long(argc, argv, "RUFQSTr:b:vkhscVfmnoldepqituwygz", opts, &option_index))) { + while((opt = getopt_long(argc, argv, "RUDQSTr:b:vkhscVfmnoldepqituwygz", opts, &option_index))) { alpm_list_t *list = NULL, *item = NULL; /* lists for splitting strings */ if(opt < 0) { @@ -447,6 +455,7 @@ static int parseargs(int argc, char *argv[]) case 1012: config->flags |= PM_TRANS_FLAG_ALLEXPLICIT; break; + case 'D': config->op = (config->op != PM_OP_MAIN ? 0 : PM_OP_DATABASE); break; case 'Q': config->op = (config->op != PM_OP_MAIN ? 0 : PM_OP_QUERY); break; case 'R': config->op = (config->op != PM_OP_MAIN ? 0 : PM_OP_REMOVE); break; case 'S': config->op = (config->op != PM_OP_MAIN ? 0 : PM_OP_SYNC); break; @@ -932,6 +941,9 @@ int main(int argc, char *argv[]) /* start the requested operation */ switch(config->op) { + case PM_OP_DATABASE: + ret = pacman_database(pm_targets); + break; case PM_OP_REMOVE: ret = pacman_remove(pm_targets); break; diff --git a/src/pacman/pacman.h b/src/pacman/pacman.h index 97d0301..7c7801d 100644 --- a/src/pacman/pacman.h +++ b/src/pacman/pacman.h @@ -21,6 +21,8 @@ #include <alpm_list.h> +/* database.c */ +int pacman_database(alpm_list_t *targets); /* query.c */ int pacman_query(alpm_list_t *targets); /* remove.c */ diff --git a/src/pacman/util.c b/src/pacman/util.c index 8056fbd..b7248d7 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -71,7 +71,7 @@ int trans_release(void) int needs_root(void) { - if(config->op == PM_OP_UPGRADE || config->op == PM_OP_REMOVE || /* -U, -R */ + if(config->op == PM_OP_UPGRADE || config->op == PM_OP_REMOVE || config->op == PM_OP_DATABASE || /* -U, -R, -D */ (config->op == PM_OP_SYNC && (config->op_s_clean || config->op_s_sync || /* -Sc, -Sy */ (!config->group && !config->op_s_info && !config->op_q_list /* all other -S combinations, where */ && !config->op_s_search && !config->op_s_printuris)))) { /* -g, -i, -l, -s, -p is not set */ -- 1.6.0.3

1 1

[pacman-dev] [PATCH 1/2] Don't print prompt with noconfirm
by Brendan Hide 20 May '09

20 May '09

Remove extraneous checks to config->noconfirm, shouldn't prompt user if noconfirm is set. Returns appropriate value immediately rather than later. Signed-off-by: Brendan Hide <brendan(a)swiftspirit.co.za> --- src/pacman/util.c | 13 ++++--------- 1 files changed, 4 insertions(+), 9 deletions(-) diff --git a/src/pacman/util.c b/src/pacman/util.c index b80b09a..9f2c6b5 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -645,12 +645,12 @@ static int question(short preset, char *fmt, va_list args) FILE *stream; if(config->noconfirm) { - stream = stdout; - } else { - /* Use stderr so questions are always displayed when redirecting output */ - stream = stderr; + return(preset); } + /* Use stderr so questions are always displayed when redirecting output */ + stream = stderr; + vfprintf(stream, fmt, args); if(preset) { @@ -659,11 +659,6 @@ static int question(short preset, char *fmt, va_list args) fprintf(stream, " %s ", _("[y/N]")); } - if(config->noconfirm) { - fprintf(stream, "\n"); - return(preset); - } - if(fgets(response, 32, stdin)) { strtrim(response); if(strlen(response) == 0) { -- 1.6.3.1

1 0

[pacman-dev] noconfirm trivial bug - prompt printed but unused/unnecessary
by Brendan Hide 20 May '09

20 May '09

Hi all I'm still getting my head around git and pacman-dev's workflow - I know its not that complicated, just need a bit of time. When using --noconfirm the prompt is presented (odd part) and the user (rightly) is not given an opportunity to confirm: > [ brendan@swift : 12:36:40 : ~/src/pacman ] > :) sudo pacman -Sc --noconfirm > Cache directory: /var/cache/pacman/pkg/ > Do you want to remove outdated packages from cache? > [Y/n] <------ > removing old packages from cache... done. > Database directory: /var/lib/pacman/ > Do you want to remove unused repositories? [Y/n] <------ > Database directory cleaned up > [ brendan@swift : 12:36:57 : ~/src/pacman ] > :) Best fix I can think of is to just mention that we're using a default because the --noconfirm flag has been used. The alternative (which is less informative for the user) is to not present the prompt at all. I've inserted 2 strings below. Assuming this is the right change to make, what else would I need to do to ensure that this is compatible with the i18n measures already in place? util.c, lines 641-680: > /* presents a prompt and gets a Y/N answer */ > static int question(short preset, char *fmt, va_list args) > { > char response[32]; > FILE *stream; > > if(config->noconfirm) { > stream = stdout; > } else { > /* Use stderr so questions are always displayed when > redirecting output */ > stream = stderr; > } > > vfprintf(stream, fmt, args); > > if(preset) { > fprintf(stream, " %s ", _("[Y/n]")); > } else { > fprintf(stream, " %s ", _("[y/N]")); > } > > if(config->noconfirm) { > fprintf(stream, "\n"); Replace the 'fprintf(stream, "\n");' line above with something like: if(preset) { fprintf(stream, "%s", _("noconfirm option set, defaulting to Yes\n")); } else { fprintf(stream, "%s", _("noconfirm option set, defaulting to No\n")); } > return(preset); > } > > if(fgets(response, 32, stdin)) { > strtrim(response); > if(strlen(response) == 0) { > return(preset); > } > > if(!strcasecmp(response, _("Y")) || > !strcasecmp(response, _("YES"))) { > return(1); > } else if (!strcasecmp(response, _("N")) || > !strcasecmp(response, _("NO"))) { > return(0); > } > } > return(0); > } -- __________ Brendan Hide

3 4

Re: [pacman-dev] [arch-general] Marking a package as a dependency
by Xavier 20 May '09

20 May '09

On Wed, May 20, 2009 at 9:50 AM, Magnus Therning <magnus(a)therning.org> wrote: > I just recently bothered reading part of pacman's man page and found > that I probably should have performed a `pacman -U --asdeps > mypkg.tar.gz` as I installed dependencies for packages I build > manually. However I didn't, so can I retro-actively change the > reason-for-installation of an already installed package without > re-installing it? (No, I couldn't decipher whether the man page > already tells me how to do this :-) > See http://bugs.archlinux.org/task/12950 and http://bugs.archlinux.org/task/13964 especially Dan comment : You can always go and tweak the database file to change the reason if truly necessary. and Nagy comment : If someone suggest me good pacman switches, I will provide a patch for this. ;-) (I think we need a new main operation, -D/--database for example).

1 0

[pacman-dev] [PATCH] xdelta : only handle gz compression specifically
by Xavier 19 May '09

19 May '09

There is apparently no need to handle the re-compression manually when applying a xdelta patch in case of bzip2 or xz. Only gzip needs to be handled specifically for disabling timestamp with the -n option. After this patch, if xdelta is enhanced with xz support (1-line patch), it will be transparent from pacman side. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> --- lib/libalpm/sync.c | 11 ++++------- 1 files changed, 4 insertions(+), 7 deletions(-) Note that this patch is completely untested :P diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index abda147..35e6fca 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -622,15 +622,12 @@ static int apply_deltas(pmtrans_t *trans) snprintf(to, len, "%s/%s", cachedir, d->to); /* build the patch command */ - /* compression command */ - char *compress = "cat"; if(endswith(to, ".gz")) { - compress = "gzip -n"; - } else if(endswith(to, ".bz2")) { - compress = "bzip"; + /* special handling for gzip : we disable timestamp with -n option */ + snprintf(command, PATH_MAX, "xdelta3 -d -q -R -c -s %s %s | gzip -n > %s", from, delta, to); + } else { + snprintf(command, PATH_MAX, "xdelta3 -d -q -s %s %s %s", from, delta, to); } - /* -R for disabling external recompression, -c for sending to stdout */ - snprintf(command, PATH_MAX, "xdelta3 -d -q -R -c -s %s %s | %s > %s", from, delta, compress, to); _alpm_log(PM_LOG_DEBUG, "command: %s\n", command); -- 1.6.3.1

1 1

[pacman-dev] [PATCH] Add support for the xz archive format
by Pierre Schmitz 19 May '09

19 May '09

This simple patch adds support for the xz archive format to makepkg and repo- add. Xz can be used as source, package and package db file type. Signed-off-by: Pierre Schmitz <pierre(a)archlinux.de> --- scripts/makepkg.sh.in | 5 +++++ scripts/repo-add.sh.in | 1 + 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index d978107..cc59f1b 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -648,6 +648,8 @@ extract_sources() { cmd="gunzip -d -f $file" ;; *application/x-bzip*) cmd="bunzip2 -f $file" ;; + *application/x-xz*) + cmd="xz -d -f $file" ;; *) # Don't know what to use to extract this file, # skip to the next file @@ -979,6 +981,7 @@ create_package() { case "$PKGEXT" in *tar.gz) EXT=${PKGEXT%.gz} ;; *tar.bz2) EXT=${PKGEXT%.bz2} ;; + *tar.xz) EXT=${PKGEXT%.xz} ;; *) warning "$(gettext "'%s' is not a valid archive extension.")" \ "$PKGEXT" ; EXT=$PKGEXT ;; esac @@ -996,6 +999,7 @@ create_package() { case "$PKGEXT" in *tar.gz) gzip -f -n "$pkg_file" ;; *tar.bz2) bzip2 -f "$pkg_file" ;; + *tar.xz) xz -z -f "$pkg_file" ;; esac ret=$? fi @@ -1054,6 +1058,7 @@ create_srcpackage() { case "$SRCEXT" in *tar.gz) TAR_OPT="z" ;; *tar.bz2) TAR_OPT="j" ;; + *tar.xz) TAR_OPT="J" ;; *) warning "$(gettext "'%s' is not a valid archive extension.")" \ "$SRCEXT" ;; esac diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index 2390a92..bbd41a2 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -462,6 +462,7 @@ if [ $success -eq 1 ]; then case "$REPO_DB_FILE" in *tar.gz) TAR_OPT="z" ;; *tar.bz2) TAR_OPT="j" ;; + *tar.xz) TAR_OPT="J" ;; *) warning "$(gettext "'%s' does not have a valid archive extension.")" \ "$REPO_DB_FILE" ;; esac -- 1.6.3 -- Pierre Schmitz Clemens-August-Straße 76 53115 Bonn Telefon 0228 9716608 Mobil 0160 95269831 Jabber pierre(a)jabber.archlinux.de WWW http://www.archlinux.de

3 6

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.2.2-165-g35b9dfc
by dan＠archlinux.org 19 May '09

19 May '09

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, master has been updated via 35b9dfc3805821cb504231a5e5ce5a8694278fb7 (commit) via c301d6aa250620fda6b268e17e1b0dd41027e90b (commit) from 0bf340f73c1b1705ab9314955c931a83e15fecb3 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 35b9dfc3805821cb504231a5e5ce5a8694278fb7 Author: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> Date: Tue May 12 00:45:18 2009 -0300 Remove unused included headers from testdb.c and testpkg.c libgen.h was used for basename() in function main() from src/util/testdb.c string.h was used for strlen() in function output_cb() from src/util/testpkg.c Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit c301d6aa250620fda6b268e17e1b0dd41027e90b Author: Pierre Schmitz <pierre(a)archlinux.de> Date: Wed May 13 08:21:11 2009 +0200 Add support for the xz archive format This simple patch adds support for the xz archive format to makepkg and repo- add. Xz can be used as source, package and package db file type. Signed-off-by: Pierre Schmitz <pierre(a)archlinux.de> [Dan: fixed a few alignment issues] Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: scripts/makepkg.sh.in | 5 +++++ scripts/repo-add.sh.in | 1 + src/util/testdb.c | 1 - src/util/testpkg.c | 1 - 4 files changed, 6 insertions(+), 2 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.2.2-163-g0bf340f
by dan＠archlinux.org 19 May '09

19 May '09

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, master has been updated via 0bf340f73c1b1705ab9314955c931a83e15fecb3 (commit) via 882bff36acad5c47df5b35fd3afb411dc4f092b0 (commit) via f89f7e136ba8d923680a6d0342d5e51d4fda1570 (commit) from 212ea8a9ed342efe2d74655cdebf668cc0cc7ce2 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 0bf340f73c1b1705ab9314955c931a83e15fecb3 Author: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Sat Apr 18 17:35:08 2009 +0200 Remove unused error codes and handle PM_ERR_RETRIEVE by alpm_strerror() Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 882bff36acad5c47df5b35fd3afb411dc4f092b0 Author: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Mon Apr 13 15:08:38 2009 +0200 Remove find_replacements() "Foo replaces bar" simply means that "foo is a new version of bar". So this patch refactors the code to use this "rule". _alpm_sync_sysupgrade now does the following for each local package [bar] (pseudo-code): for db in syncdbs { if(db contains bar) {check if db/bar is an upgrade; break;} replacers = find(bar replacers in db); if(replacers!=NULL) {ask_user; break;} } Note: 1. Replacers are grouped per repo. If more than one package replace bar in a repo, all of them are considered ("package set of bar replacers"). 2. If repo1/foo1 and repo2/foo2 both replaces bar, only repo1/foo1 is considered (if repo1 stands before repo2 in pacman.conf). FS#11737 is fixed. 3. It can happen that pacman doesn't consider any replacer, if it found a literal "earlier", so sync132.py modified accordingly (btw, that situation should not appear irl). The new sysupgrade code doesn't use sync_newversion(), so I removed the "local is newer than repo" message, which was annoying with -Qu and SyncFirst. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit f89f7e136ba8d923680a6d0342d5e51d4fda1570 Author: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Thu May 14 16:15:20 2009 +0200 Query documentation updates The old documentation didn't emphasize our filtering options at all, and it was a bit misleading. ("List ALL...") I also clarified the description of -Qu. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: doc/pacman.8.txt | 28 ++++--- lib/libalpm/alpm.h | 9 -- lib/libalpm/error.c | 17 +---- lib/libalpm/sync.c | 200 ++++++++++++++++++--------------------------- pactest/tests/sync132.py | 4 +- src/pacman/pacman.c | 10 +- 6 files changed, 106 insertions(+), 162 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Query documentation updates
by Nagy Gabor 19 May '09

19 May '09

>From 8f675582f8f0098ec524fa702c38058c687e53fd Mon Sep 17 00:00:00 2001 From: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Thu, 14 May 2009 16:15:20 +0200 Subject: [PATCH] Query documentation updates The old documentation didn't emphasize our filtering options at all, and it was a bit misleading. ("List ALL...") I also clarified the description of -Qu. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> --- doc/pacman.8.txt | 28 +++++++++++++++++----------- src/pacman/pacman.c | 10 +++++----- 2 files changed, 22 insertions(+), 16 deletions(-) diff --git a/doc/pacman.8.txt b/doc/pacman.8.txt index 37680be..4582be5 100644 --- a/doc/pacman.8.txt +++ b/doc/pacman.8.txt @@ -33,7 +33,10 @@ Operations packages and their files, as well as meta-information about individual packages (dependencies, conflicts, install date, build date, size). This can be run against the local package database or can be used on - individual '.tar.gz' packages. See <<QO,Query Options>> below. + individual '.tar.gz' packages. In the first case, if no package names + are provided in the command line, all installed packages will be + queried. Additionally, various filters can be applied on the package + list. See <<QO,Query Options>> below. *-R, \--remove*:: Remove a package from the system. Groups can also be specified to be @@ -164,16 +167,17 @@ Query Options[[QO]] it will be shown if available. *-d, \--deps*:: - List all packages installed as dependencies. This option can be combined - with '-t' for listing real orphans- packages that were installed as - dependencies but are no longer required by any installed package. ('-Qdt' - is equivalent to the pacman 3.0.X '-Qe' option.) + Restrict or filter output to packages installed as dependencies. This + option can be combined with '-t' for listing real orphans- packages that + were installed as dependencies but are no longer required by any + installed package. ('-Qdt' is equivalent to the pacman 3.0.X '-Qe' + option.) *-e, \--explicit*:: - List all packages explicitly installed. This option can be combined with - '-t' to list top-level packages- those packages that were explicitly - installed but are not required by any other package. ('-Qet' is equivalent - to the pacman 2.9.X '-Qe' option.) + Restrict or filter output to packages explicitly installed. This option + can be combined with '-t' to list top-level packages- those packages + that were explicitly installed but are not required by any other + package. ('-Qet' is equivalent to the pacman 2.9.X '-Qe' option.) *-g, \--groups*:: Display all packages that are members of a named group. If a name is not @@ -221,8 +225,10 @@ Query Options[[QO]] installed package. *-u, \--upgrades*:: - Lists all packages that are out of date on the local system. This option - works best if the sync database is refreshed using '-Sy'. + Restrict or filter output to packages that are out of date on the local + system. (Only package versions are used to find outdated packages, + replacements are not checked here.) This option works best if the sync + database is refreshed using '-Sy'. Remove Options[[RO]] diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 14cfdfa..72a72ba 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -103,17 +103,17 @@ static void usage(int op, const char * const myname) printf("%s: %s {-Q --query} [%s] [%s]\n", str_usg, myname, str_opt, str_pkg); printf("%s:\n", str_opt); printf(_(" -c, --changelog view the changelog of a package\n")); - printf(_(" -d, --deps list all packages installed as dependencies\n")); - printf(_(" -e, --explicit list all packages explicitly installed\n")); + printf(_(" -d, --deps list packages installed as dependencies [filter]\n")); + printf(_(" -e, --explicit list packages explicitly installed [filter]\n")); printf(_(" -g, --groups view all members of a package group\n")); printf(_(" -i, --info view package information (-ii for backup files)\n")); printf(_(" -l, --list list the contents of the queried package\n")); - printf(_(" -m, --foreign list installed packages not found in sync db(s)\n")); + printf(_(" -m, --foreign list installed packages not found in sync db(s) [filter]\n")); printf(_(" -o, --owns <file> query the package that owns <file>\n")); printf(_(" -p, --file <package> query a package file instead of the database\n")); printf(_(" -s, --search <regex> search locally-installed packages for matching strings\n")); - printf(_(" -t, --unrequired list all packages not required by any package\n")); - printf(_(" -u, --upgrades list all outdated packages\n")); + printf(_(" -t, --unrequired list packages not required by any package [filter]\n")); + printf(_(" -u, --upgrades list outdated packages [filter]\n")); printf(_(" -q, --quiet show less information for query and search\n")); } else if(op == PM_OP_SYNC) { printf("%s: %s {-S --sync} [%s] [%s]\n", str_usg, myname, str_opt, str_pkg); -- 1.6.0.3

2 1

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.2.2-160-g212ea8a
by dan＠archlinux.org 19 May '09

19 May '09

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, master has been updated via 212ea8a9ed342efe2d74655cdebf668cc0cc7ce2 (commit) via a812ad4ea4faeb5cb229a574adef47764840f890 (commit) via 1bbb34365c437ebdf85874f39474bce37c4b7144 (commit) via 1d8d932fa65d920ab4d43d90f3227c17714f4f14 (commit) via 783e710839d6de059b95e8ed117bdcee1233720f (commit) via c5d9b999c76dceb077d5d5332b440a12698e8519 (commit) via 4a582fac2a24b6fca170721ec7adcca9239457ff (commit) via 86cd72573b03297044112e50a88bd651190aa284 (commit) via 80caeabce0f28125f3b68388996ce39e58f2e5e8 (commit) via 250e66e57b6a187b5643ea6db088552e4efef488 (commit) via 5e32928a42366fd3df27ffe108b44fcfe35617dd (commit) via de44a0f474f4e78359b890644645bd7e153983d2 (commit) from 20017354f7ccb58bf4f78691985a5d237f4dbc90 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 212ea8a9ed342efe2d74655cdebf668cc0cc7ce2 Author: Cedric Staniewski <cedric(a)gmx.ca> Date: Tue May 12 11:01:58 2009 +0200 repo-add: fix -n tests which are applicable only to strings Signed-off-by: Cedric Staniewski <cedric(a)gmx.ca> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit a812ad4ea4faeb5cb229a574adef47764840f890 Author: Cedric Staniewski <cedric(a)gmx.ca> Date: Tue May 12 11:09:11 2009 +0200 libarchive development has moved to Google Code Signed-off-by: Cedric Staniewski <cedric(a)gmx.ca> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 1bbb34365c437ebdf85874f39474bce37c4b7144 Author: Dan McGee <dan(a)archlinux.org> Date: Mon May 18 23:00:16 2009 -0500 Add pyc files to autoclean Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 1d8d932fa65d920ab4d43d90f3227c17714f4f14 Author: Dan McGee <dan(a)archlinux.org> Date: Mon May 18 22:59:54 2009 -0500 Remove recursive remove in autoclean.sh Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 783e710839d6de059b95e8ed117bdcee1233720f Author: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> Date: Tue May 12 12:54:49 2009 -0300 Add more files to cleanup in autoclean.sh Add files pactest/tests/Makefile.in , pactest/tests/Makefile and contrib/Makefile.in , contrib/Makefile to list of cleanup script. Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit c5d9b999c76dceb077d5d5332b440a12698e8519 Author: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> Date: Tue May 12 13:04:11 2009 -0300 Add repo-remove.8 to list of cleanup in doc/Makefile.am repo-remove.8 is generated with Makefile but is not removed on clean. This patch add it to list of untracked autoconf files. Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 4a582fac2a24b6fca170721ec7adcca9239457ff Merge: 86cd72573b03297044112e50a88bd651190aa284 80caeabce0f28125f3b68388996ce39e58f2e5e8 Author: Dan McGee <dan(a)archlinux.org> Date: Mon May 18 22:51:25 2009 -0500 Merge commit 'allan/working' commit 86cd72573b03297044112e50a88bd651190aa284 Author: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> Date: Mon May 18 01:56:06 2009 -0300 Add an initial pactest/test/.gitignore Add an initial pactest/test/.gitignore to exclude sync200.py that is generated from sync200.py.in Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 80caeabce0f28125f3b68388996ce39e58f2e5e8 Author: Allan McRae <allan(a)archlinux.org> Date: Sat May 16 14:39:18 2009 +1000 NEWS file updates for makepkg and contrib Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 250e66e57b6a187b5643ea6db088552e4efef488 Author: Allan McRae <allan(a)archlinux.org> Date: Sat May 16 13:48:10 2009 +1000 makepkg: fix sourcing BUILDSCRIPT and PATH issues The bash source command looks in the users PATH for the file to source before the local directory. This causes issues when someone has a PKGBUILD somewhere in their path (for unknown some reason...). Fixes FS#14727. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 5e32928a42366fd3df27ffe108b44fcfe35617dd Author: Allan McRae <allan(a)archlinux.org> Date: Mon May 11 01:16:51 2009 +1000 makepkg: Document package splitting Signed-off-by: Allan McRae <allan(a)archlinux.org> commit de44a0f474f4e78359b890644645bd7e153983d2 Author: Allan McRae <allan(a)archlinux.org> Date: Sun Apr 26 19:52:29 2009 +1000 makepkg: do not update pkgver when building source package When making a source package for a SCM PKGBUILD, makepkg should not update the pkgver/pkgrel. Noted in FS#14456. Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: INSTALL | 2 +- NEWS | 20 ++++++++++++++++ autoclean.sh | 57 ++++++++++++++++++++++++--------------------- doc/Makefile.am | 2 +- doc/PKGBUILD.5.txt | 27 +++++++++++++++++----- doc/makepkg.8.txt | 6 ++-- pactest/tests/.gitignore | 1 + scripts/makepkg.sh.in | 18 +++++++------- scripts/repo-add.sh.in | 4 +- 9 files changed, 88 insertions(+), 49 deletions(-) create mode 100644 pactest/tests/.gitignore hooks/post-receive -- The official pacman repository

1 0