- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] makepkg: refactor sanity checking into a function
by Dan McGee 07 Jun '09

07 Jun '09

No new checks, just move it into a function and return 1 rather than exit directly. This also allows the use of local variables. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- scripts/makepkg.sh.in | 142 ++++++++++++++++++++++++++----------------------- 1 files changed, 76 insertions(+), 66 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index cb63f9a..f46b7f8 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1103,6 +1103,79 @@ install_package() { fi } +check_sanity() { + # check for no-no's in the build script + if [ -z "$pkgname" ]; then + error "$(gettext "%s is not allowed to be empty.")" "pkgname" + return 1 + fi + if [ -z "$pkgver" ]; then + error "$(gettext "%s is not allowed to be empty.")" "pkgver" + return 1 + fi + if [ -z "$pkgrel" ]; then + error "$(gettext "%s is not allowed to be empty.")" "pkgrel" + return 1 + fi + if [ "$pkgver" != "${pkgver//-/}" ]; then + error "$(gettext "%s is not allowed to contain hyphens.")" "pkgver" + return 1 + fi + if [ "$pkgrel" != "${pkgrel//-/}" ]; then + error "$(gettext "%s is not allowed to contain hyphens.")" "pkgrel" + return 1 + fi + + if [ "$arch" = 'any' ]; then + CARCH='any' + fi + + pkgbase=${pkgbase:-${pkgname[0]}} + + if ! in_array $CARCH ${arch[@]}; then + if [ "$IGNOREARCH" -eq 0 ]; then + error "$(gettext "%s is not available for the '%s' architecture.")" "$pkgbase" "$CARCH" + plain "$(gettext "Note that many packages may need a line added to their %s")" "$BUILDSCRIPT" + plain "$(gettext "such as arch=('%s').")" "$CARCH" + return 1 + fi + fi + + local provide + for provide in ${provides[@]}; do + if [ $provide != ${provide//</} -o $provide != ${provide//>/} ]; then + error "$(gettext "Provides array cannot contain comparison (< or >) operators.")" + return 1 + fi + done + + if [ "$install" -a ! -f "$install" ]; then + error "$(gettext "Install scriptlet (%s) does not exist.")" "$install" + return 1 + fi + + local valid_options=1 + local opt known kopt + for opt in ${options[@]}; do + known=0 + # check if option matches a known option or its inverse + for kopt in ${packaging_options[@]} ${other_options[@]}; do + if [ "${opt}" = "${kopt}" -o "${opt}" = "!${kopt}" ]; then + known=1 + fi + done + if [ $known -eq 0 ]; then + error "$(gettext "options array contains unknown option '%s'")" "$opt" + valid_options=0 + fi + done + if [ $valid_options -eq 0 ]; then + return 1 + fi + + return 0 +} + devel_check() { newpkgver="" @@ -1556,74 +1629,11 @@ if [ "$(type -t package)" = "function" ]; then PKGFUNC=1 fi -# check for no-no's in the build script -if [ -z "$pkgname" ]; then - error "$(gettext "%s is not allowed to be empty.")" "pkgname" - exit 1 -fi -if [ -z "$pkgver" ]; then - error "$(gettext "%s is not allowed to be empty.")" "pkgver" - exit 1 -fi -if [ -z "$pkgrel" ]; then - error "$(gettext "%s is not allowed to be empty.")" "pkgrel" - exit 1 -fi -if [ "$pkgver" != "${pkgver//-/}" ]; then - error "$(gettext "%s is not allowed to contain hyphens.")" "pkgver" - exit 1 -fi -if [ "$pkgrel" != "${pkgrel//-/}" ]; then - error "$(gettext "%s is not allowed to contain hyphens.")" "pkgrel" - exit 1 -fi - -if [ "$arch" = 'any' ]; then - CARCH='any' -fi - -pkgbase=${pkgbase:-${pkgname[0]}} - -if ! in_array $CARCH ${arch[@]}; then - if [ "$IGNOREARCH" -eq 0 ]; then - error "$(gettext "%s is not available for the '%s' architecture.")" "$pkgbase" "$CARCH" - plain "$(gettext "Note that many packages may need a line added to their %s")" "$BUILDSCRIPT" - plain "$(gettext "such as arch=('%s').")" "$CARCH" - exit 1 - fi -fi - -for provide in ${provides[@]}; do - if [ $provide != ${provide//</} -o $provide != ${provide//>/} ]; then - error "$(gettext "Provides array cannot contain comparison (< or >) operators.")" - exit 1 - fi -done -unset provide - -if [ "$install" -a ! -f "$install" ]; then - error "$(gettext "Install scriptlet (%s) does not exist.")" "$install" - exit 1 -fi - -valid_options=1 -for opt in ${options[@]}; do - known=0 - # check if option matches a known option or its inverse - for kopt in ${packaging_options[@]} ${other_options[@]}; do - if [ "${opt}" = "${kopt}" -o "${opt}" = "!${kopt}" ]; then - known=1 - fi - done - if [ $known -eq 0 ]; then - error "$(gettext "options array contains unknown option '%s'")" "$opt" - valid_options=0 - fi -done -if [ $valid_options -eq 0 ]; then +# check the PKGBUILD for some basic requirements +check_sanity || insane=1 +if [ $insane -eq 1 ]; then exit 1 fi -unset valid_options opt known kopt # We need to run devel_update regardless of whether we are in the fakeroot # build process so that if the user runs makepkg --forcever manually, we -- 1.6.3.2

2 1

[pacman-dev] [PATCH 1/3] Give sensible feedback when a repo has no configured servers
by Dan McGee 06 Jun '09

06 Jun '09

This fixes FS#14899. When running an -Sp operation without servers configured for a repository, we would segfault, so add an assert to the backend method returning the first server preventing a null pointer dereference. In addition, add a new error code to libalpm that indicates we have no servers configured for a repository. This makes -Sy and -S <package> operations fail gracefully and helpfully when a repo is set up with no servers, as the default mirrorlist in Arch is provided this way. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- lib/libalpm/alpm.h | 1 + lib/libalpm/db.c | 1 + lib/libalpm/dload.c | 2 ++ lib/libalpm/error.c | 2 ++ lib/libalpm/sync.c | 4 +++- src/pacman/sync.c | 10 +++++++++- 6 files changed, 18 insertions(+), 2 deletions(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 5cf1e94..1b67f8a 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -480,6 +480,7 @@ enum _pmerrno_t { PM_ERR_DB_REMOVE, /* Servers */ PM_ERR_SERVER_BAD_URL, + PM_ERR_SERVER_NONE, /* Transactions */ PM_ERR_TRANS_NOT_NULL, PM_ERR_TRANS_NULL, diff --git a/lib/libalpm/db.c b/lib/libalpm/db.c index 561967c..6749ab1 100644 --- a/lib/libalpm/db.c +++ b/lib/libalpm/db.c @@ -232,6 +232,7 @@ const char SYMEXPORT *alpm_db_get_url(const pmdb_t *db) /* Sanity checks */ ASSERT(handle != NULL, return(NULL)); ASSERT(db != NULL, return(NULL)); + ASSERT(db->servers != NULL, return(NULL)); url = (char*)db->servers->data; diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index 5b0a691..aec0b5c 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -388,6 +388,8 @@ int _alpm_download_single_file(const char *filename, alpm_list_t *i; int ret = -1; + ASSERT(servers != NULL, RET_ERR(PM_ERR_SERVER_NONE, -1)); + for(i = servers; i; i = i->next) { const char *server = i->data; char *fileurl = NULL; diff --git a/lib/libalpm/error.c b/lib/libalpm/error.c index fdff9ed..47e254e 100644 --- a/lib/libalpm/error.c +++ b/lib/libalpm/error.c @@ -84,6 +84,8 @@ const char SYMEXPORT *alpm_strerror(int err) /* Servers */ case PM_ERR_SERVER_BAD_URL: return _("invalid url for server"); + case PM_ERR_SERVER_NONE: + return _("no servers configured for repository"); /* Transactions */ case PM_ERR_TRANS_NOT_NULL: return _("transaction already initialized"); diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index abda147..519066c 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -777,7 +777,9 @@ int _alpm_sync_commit(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t **data) if(_alpm_download_files(files, current->servers, cachedir)) { _alpm_log(PM_LOG_WARNING, _("failed to retrieve some files from %s\n"), current->treename); - pm_errno = PM_ERR_RETRIEVE; + if(pm_errno == 0) { + pm_errno = PM_ERR_RETRIEVE; + } goto error; } FREELIST(files); diff --git a/src/pacman/sync.c b/src/pacman/sync.c index 68fb81a..2e57b01 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -675,7 +675,15 @@ static int sync_trans(alpm_list_t *targets) for(i = packages; i; i = alpm_list_next(i)) { pmpkg_t *pkg = alpm_list_getdata(i); pmdb_t *db = alpm_pkg_get_db(pkg); - printf("%s/%s\n", alpm_db_get_url(db), alpm_pkg_get_filename(pkg)); + const char *dburl = alpm_db_get_url(db); + if(dburl) { + printf("%s/%s\n", dburl, alpm_pkg_get_filename(pkg)); + } else { + /* can't use WARNING here, we don't show warnings in -Sp... */ + pm_fprintf(stderr, PM_LOG_ERROR, _("no database for package: %s\n"), + alpm_pkg_get_name(pkg)); + } + } /* we are done */ goto cleanup; -- 1.6.3.2

3 3

[pacman-dev] [PATCH] Allow remove to accept 'local/' prefix
by Dan McGee 06 Jun '09

06 Jun '09

See FS#14542- this allows -Qs output to be fed back into pacman without problems or having to strip off the 'local/' prefix manually. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- lib/libalpm/remove.c | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c index 9dfff9c..62fd396 100644 --- a/lib/libalpm/remove.c +++ b/lib/libalpm/remove.c @@ -49,6 +49,7 @@ int _alpm_remove_loadtarget(pmtrans_t *trans, pmdb_t *db, char *name) { pmpkg_t *info; + const char *targ; ALPM_LOG_FUNC; @@ -56,12 +57,19 @@ int _alpm_remove_loadtarget(pmtrans_t *trans, pmdb_t *db, char *name) ASSERT(trans != NULL, RET_ERR(PM_ERR_TRANS_NULL, -1)); ASSERT(name != NULL, RET_ERR(PM_ERR_WRONG_ARGS, -1)); - if(_alpm_pkg_find(trans->packages, name)) { + targ = strchr(name, '/'); + if(targ && strncmp(name, "local", 5) == 0) { + targ++; + } else { + targ = name; + } + + if(_alpm_pkg_find(trans->packages, targ)) { RET_ERR(PM_ERR_TRANS_DUP_TARGET, -1); } - if((info = _alpm_db_get_pkgfromcache(db, name)) == NULL) { - _alpm_log(PM_LOG_DEBUG, "could not find %s in database\n", name); + if((info = _alpm_db_get_pkgfromcache(db, targ)) == NULL) { + _alpm_log(PM_LOG_DEBUG, "could not find %s in database\n", targ); RET_ERR(PM_ERR_PKG_NOT_FOUND, -1); } -- 1.6.3.2

2 1

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.2.2-171-g9af9c0f
by dan＠archlinux.org 06 Jun '09

06 Jun '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 9af9c0f328094228fa363d842ddc9b2a605f0d22 (commit) from f4ecc908eccc3ace2e40b15be837e4fa44ecf0a0 (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 9af9c0f328094228fa363d842ddc9b2a605f0d22 Author: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Fri Jun 5 14:40:41 2009 +0200 Document -T in the manual See FS#14833. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> [Dan: slight wording rework] Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: doc/pacman.8.txt | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Document -T in the manual
by Nagy Gabor 05 Jun '09

05 Jun '09

See FS#14833. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> --- doc/pacman.8.txt | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/doc/pacman.8.txt b/doc/pacman.8.txt index 195135b..0d86bad 100644 --- a/doc/pacman.8.txt +++ b/doc/pacman.8.txt @@ -80,6 +80,13 @@ to determine which packages need upgrading. This behavior operates as follows: Numeric: 1 < 1.0 < 1.1 < 1.1.1 < 1.2 < 2.0 < 3.0.0 +*-T, \--deptest*:: + Check dependencies. This operation will check each dependency specified + and return a list of those which are not currently satisfied on the + system. This is mostly useful in scripts, for example, makepkg uses this + to check dependencies. This operation accepts no other options. Example + usage: `pacman -T qt "bash>=3.2"`. + *-U, \--upgrade*:: Upgrade or add package(s) to the system. Either a URL or file path can be specified. This is a ``remove-then-add'' process. See <<HCF,Handling Config -- 1.6.3.1

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.2.2-170-gf4ecc90
by dan＠archlinux.org 02 Jun '09

02 Jun '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 f4ecc908eccc3ace2e40b15be837e4fa44ecf0a0 (commit) via c520d3845113ce4dc1a473c012288da7f2a655b8 (commit) via 1b4135ca5d0654d18398d648ba48ecf14caa2289 (commit) via 6360fe01007f34b1fa2285b6c741d2dffb81da28 (commit) via 30e2496775897644fb397b32e8bdf0ae2f827216 (commit) from 35b9dfc3805821cb504231a5e5ce5a8694278fb7 (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 f4ecc908eccc3ace2e40b15be837e4fa44ecf0a0 Author: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Sat May 16 17:59:45 2009 +0200 We don't need root with -Sp FS#8905 is fixed. The front-end passes PM_TRANS_FLAG_NOLOCK to the back-end, so it doesn't lock the database. That's why we don't need root anymore. I reworked (and renamed) needs_transaction() accordingly. I also added missing -Sc check there (for example, -Sci didn't print non-root error, but pacman wanted to lock the database). Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit c520d3845113ce4dc1a473c012288da7f2a655b8 Author: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Sat May 16 16:54:21 2009 +0200 Introduce PM_TRANS_FLAG_NOLOCK This flag indicates that the front-end will not call alpm_trans_commit(), so the database needn't be locked. This is the first step toward fixing FS#8905. If this flag is set, alpm_trans_commit() does nothing and returns with an error (that has new code: PM_ERR_TRANS_NOT_LOCKED). Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 1b4135ca5d0654d18398d648ba48ecf14caa2289 Author: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Fri May 22 01:06:33 2009 +0200 Change package to package(s) and file to file(s) in documentation The pacman --help pages and the manual suggested that only one package can be upgraded/removed per transaction. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 6360fe01007f34b1fa2285b6c741d2dffb81da28 Author: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> Date: Thu May 21 01:19:37 2009 -0300 Remove unused string.h from src/pacman/remove.c This header was used in the code for the function strdup() that is not used anymore. Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 30e2496775897644fb397b32e8bdf0ae2f827216 Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Thu Feb 26 18:16:23 2009 +0100 repo-add: fail early if repo can not be created Before this commit, the repo creation could fail after all packages have been added to the database. Now this will be detected before adding anything. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: doc/pacman.8.txt | 4 ++-- lib/libalpm/alpm.h | 4 +++- lib/libalpm/error.c | 2 ++ lib/libalpm/trans.c | 32 ++++++++++++++++++++------------ scripts/repo-add.sh.in | 14 ++++++++++++-- src/pacman/pacman.c | 7 ++++--- src/pacman/remove.c | 1 - src/pacman/util.c | 19 ++++++++----------- src/pacman/util.h | 2 +- 9 files changed, 52 insertions(+), 33 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] Awesome local DB corruption
by Dan McGee 02 Jun '09

02 Jun '09

As an FYI for those that don't crawl the bug list looking for new things: http://bugs.archlinux.org/task/14914

1 0

Re: [pacman-dev] Bump on upgrade046.py
by Nagy Gabor 01 Jun '09

01 Jun '09

> Nagy Gabor wrote: > > I thought -Suf cannot hurt anything, so I just did -Suf. > > I still can't believe you did that! I always say the guideline is to > only use -f for one package at a time. Yes, I always say that, too (on #archlinux.hu irc channel). At least now I can show a concrete example (link to this thread), why it is not recommended to do that. ;-) But the point is that if pacman _were_ bug-free, my -Suf would not break anything! > BTW, -Sud is also bad! :) Yes. In fact, this was the main reason for -f. I have to choose between breaking some deps* (when your system is really outdated, I am pretty sure, that you will break some ("inverse") deps with -Sf, I did it many times ;-) and force. Clearly, I made a bad decision (I forgot about the upgrade046.py bug).

1 0

[pacman-dev] Bump on upgrade046.py
by Nagy Gabor 01 Jun '09

01 Jun '09

Hi! I think this bug has just hurted my system today. Since I have no net in my sublet, I do -Su very rarely, so today's sysupgrade upgraded 415 packages (my system was ~0.7 year-old). I got lots of false fileconflict errors first (probably due to the symlink bug). I was lazy to resolve all of them by hand, and since I never put untracked files out of my home dir, I thought -Suf cannot hurt anything, so I just did -Suf. During sysupgrade, lots of "gconftool-2: error while loading shared libraries: libdbus-1.so.3: cannot open shared object file: No such file or directory" messages popped up (install scriptlets). Wow :-(. After pacman -Suf had finished, I did some investigation (I didn't want to press ctrl-c during sysupgrade). First I thought, that there is a missing dependency around gconf (testdb said that my local database was consistent), but I was wrong: I had the package dbus-core installed (up-to-date version), which should contain the missing lib (-Ql), but the file libdbus-1.so.3 was not found in /usr/lib. I guess, I've just run into the file relocation bug (otherwise, we have a more serious bug here), showed by upgrade046.py. Briefly, the file relocation check is hacked into the fileconflict check, which is omitted with -f. Bye P.S.: I used pacman 3.2.2-1.

2 2

[pacman-dev] [PATCH] Change package to package(s) and file to file(s) in documentation
by Nagy Gabor 21 May '09

21 May '09

From 2f51241a85f1df7219ae0649bff9a0de369a8c84 Mon Sep 17 00:00:00 2001 From: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Fri, 22 May 2009 01:06:33 +0200 Subject: [PATCH] Change package to package(s) and file to file(s) in documentation The pacman --help pages and the manual suggested that only one package can be upgraded/removed per transaction. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> --- doc/pacman.8.txt | 4 ++-- src/pacman/pacman.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/pacman.8.txt b/doc/pacman.8.txt index 4b7cf2d..195135b 100644 --- a/doc/pacman.8.txt +++ b/doc/pacman.8.txt @@ -45,7 +45,7 @@ Operations list. See <<QO,Query Options>> below. *-R, \--remove*:: - Remove a package from the system. Groups can also be specified to be + Remove package(s) from the system. Groups can also be specified to be removed, in which case every package in that group will be removed. Files belonging to the specified package will be deleted, and the database will be updated. Most configuration files will be saved @@ -81,7 +81,7 @@ to determine which packages need upgrading. This behavior operates as follows: 1 < 1.0 < 1.1 < 1.1.1 < 1.2 < 2.0 < 3.0.0 *-U, \--upgrade*:: - Upgrade or add a package to the system. Either a URL or file path can be + Upgrade or add package(s) to the system. Either a URL or file path can be specified. This is a ``remove-then-add'' process. See <<HCF,Handling Config Files>> for an explanation on how pacman takes care of config files. diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index c817828..1629171 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -65,8 +65,8 @@ static void usage(int op, const char * const myname) /* prefetch some strings for usage below, which moves a lot of calls * out of gettext. */ char const * const str_opt = _("options"); - char const * const str_file = _("file"); - char const * const str_pkg = _("package"); + char const * const str_file = _("file(s)"); + char const * const str_pkg = _("package(s)"); char const * const str_usg = _("usage"); char const * const str_opr = _("operation"); -- 1.6.3.1

1 0