- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] makepkg: allow passing arguments with spaces
by Allan McRae 22 Oct '09

22 Oct '09

Currently makepkg takes the commandline arguments, assigns them to a variable and passes that variable to the next makepkg call (within fakeroot). Use a comination of quotes and arrays in this process to ensure any arguments passed within quotes and containing spaces stay as a single argument during the second makepkg call. Thanks to Dan for figuring out how to get this working. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 7e10eef..309211b 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1496,7 +1496,7 @@ if [ ! $(type -t gettext) ]; then } fi -ARGLIST=$@ +ARGLIST=("$@") # Parse Command Line Options. OPT_SHORT="AcCdefFghiLmop:rRsV" @@ -1916,9 +1916,9 @@ else msg "$(gettext "Entering fakeroot environment...")" if [ -n "$newpkgver" ]; then - fakeroot -- $0 --forcever $newpkgver -F $ARGLIST || exit $? + fakeroot -- $0 --forcever $newpkgver -F "${ARGLIST[@]}" || exit $? else - fakeroot -- $0 -F $ARGLIST || exit $? + fakeroot -- $0 -F "${ARGLIST[@]}" || exit $? fi fi fi -- 1.6.5.1

1 0

[pacman-dev] [PATCH] makepkg: remove .part file after a failed download
by Cedric Staniewski 22 Oct '09

22 Oct '09

Signed-off-by: Cedric Staniewski <cedric(a)gmx.ca> --- scripts/makepkg.sh.in | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 40367ae..f6b87c2 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -336,7 +336,12 @@ download_file() { dlcmd="$dlcmd \"$url\"" fi - eval $dlcmd || return $? + eval $dlcmd + local ret=$? + if [ $ret -gt 0 ]; then + rm -f -- "$dlfile" + return $ret + fi # rename the temporary download file to the final destination if [ "$dlfile" != "$file" ]; then -- 1.6.5.1

6 19

[pacman-dev] bash argument passing help
by Allan McRae 21 Oct '09

21 Oct '09

Hi all, This problem has been doing my head in... First a minimal example that reflects how makepkg does things: --one.sh-- #!/bin/bash echo "pass 1:" for arg in "$@"; do echo $arg done echo ARGLIST="$@" ./two.sh $ARGLIST --end one.sh-- --two.sh-- #!/bin/bash echo "pass 2:" for arg in "$@"; do echo $arg done --end two.sh-- then run: ./one.sh -f -h "foo bar" pass 1: -f -h foo bar pass 2: -f -h foo bar Note how in pass two, foo and bar are no longer in the one line. Of course, passing ./two.sh "$@" works, but the argument parsing in makepkg clears that, hence the need to save it to ARGLIST. Any ideas? Allan

3 7

[pacman-dev] [PATCH] makepkg: allow specifying subsets of packages to build
by Allan McRae 21 Oct '09

21 Oct '09

This allows makepkg to only build a specified subset of packages from a split PKGBUILD. This is very useful in combination with the -R flag or when bumping the pkgrel of a single package. Fixes FS#15956. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- As always, my changes to the documenation could be improved. Suggestions welcome. doc/makepkg.8.txt | 5 +++++ scripts/makepkg.sh.in | 26 +++++++++++++++++++++----- 2 files changed, 26 insertions(+), 5 deletions(-) diff --git a/doc/makepkg.8.txt b/doc/makepkg.8.txt index ec02875..8c68143 100644 --- a/doc/makepkg.8.txt +++ b/doc/makepkg.8.txt @@ -148,6 +148,11 @@ Options remote builder, or a tarball upload. Because integrity checks are verified, all source files of the package need to be present or downloadable. +*\--pkg <`list`>*:: + Builds only the listed packages. Useful in combination with package + splitting. The use quotes is necessary when specifying multiple + packages. e.g. `--pkg "pkg1 pkg3"` + *\--noconfirm*:: (Passed to pacman) Prevent pacman from waiting for user input before proceeding with operations. diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 7e10eef..c3672b1 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -72,6 +72,7 @@ IGNOREARCH=0 HOLDVER=0 PKGFUNC=0 SPLITPKG=0 +PKGLIST="" COLORMSG=0 # Forces the pkgver of the current PKGBUILD. Used by the fakeroot call @@ -1243,6 +1244,15 @@ check_sanity() { done fi + if [ -n "$PKGLIST" ]; then + for pkg in ${PKGLIST[@]}; do + if ! in_array $pkg ${pkgname[@]}; then + error "$(gettext "requested package %s is not provided in %s")" "$pkg" "$BUILDSCRIPT" + return 1 + fi + done + fi + return 0 } @@ -1466,6 +1476,7 @@ usage() { echo "$(gettext " --asroot Allow makepkg to run as root user")" printf "$(gettext " --config <file> Use an alternate config file (instead of '%s')")\n" "$confdir/makepkg.conf" echo "$(gettext " --holdver Prevent automatic version bumping for development PKGBUILDs")" + echo "$(gettext " --pkg <list> Only build listed packages from a split package")" echo "$(gettext " --skipinteg Do not fail when integrity checks are missing")" echo "$(gettext " --source Generate a source-only tarball without downloaded sources")" echo @@ -1496,13 +1507,13 @@ if [ ! $(type -t gettext) ]; then } fi -ARGLIST=$@ +ARGLIST=("$@") # Parse Command Line Options. OPT_SHORT="AcCdefFghiLmop:rRsV" OPT_LONG="allsource,asroot,ignorearch,clean,cleancache,nodeps" OPT_LONG="$OPT_LONG,noextract,force,forcever:,geninteg,help,holdver" -OPT_LONG="$OPT_LONG,install,log,nocolor,nobuild,rmdeps,repackage,skipinteg" +OPT_LONG="$OPT_LONG,install,log,nocolor,nobuild,pkg:,rmdeps,repackage,skipinteg" OPT_LONG="$OPT_LONG,source,syncdeps,version,config:" # Pacman Options OPT_LONG="$OPT_LONG,noconfirm,noprogressbar" @@ -1540,6 +1551,7 @@ while true; do -m|--nocolor) USE_COLOR='n' ;; -o|--nobuild) NOBUILD=1 ;; -p) shift; BUILDFILE=$1 ;; + --pkg) shift; PKGLIST=$1 ;; -r|--rmdeps) RMDEPS=1 ;; -R|--repackage) REPKG=1 ;; --skipinteg) SKIPINTEG=1 ;; @@ -1722,6 +1734,11 @@ fi pkgbase=${pkgbase:-${pkgname[0]}} +if [ -n "$PKGLIST" ]; then + unset pkgname + pkgname="${PKGLIST[@]}" +fi + if [ "$SPLITPKG" -eq 0 ]; then if [ $ -f "$PKGDEST/${pkgname}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT}" \ -o -f "$PKGDEST/${pkgname}-${pkgver}-${pkgrel}-any${PKGEXT}" $ \ @@ -1914,11 +1931,10 @@ else fi msg "$(gettext "Entering fakeroot environment...")" - if [ -n "$newpkgver" ]; then - fakeroot -- $0 --forcever $newpkgver -F $ARGLIST || exit $? + fakeroot -- $0 --forcever $newpkgver -F "${ARGLIST[@]}" || exit $? else - fakeroot -- $0 -F $ARGLIST || exit $? + fakeroot -- $0 -F "${ARGLIST[@]}" || exit $? fi fi fi -- 1.6.5.1

2 2

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.3.2-77-g3758ccb
by dan＠archlinux.org 21 Oct '09

21 Oct '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 3758ccbb524b502cc6162324f1b953215b6b970e (commit) from 6c635d76a042add78f65f732928c2f10c2e5567a (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 3758ccbb524b502cc6162324f1b953215b6b970e Author: Allan McRae <allan(a)archlinux.org> Date: Wed Oct 21 13:40:17 2009 +1000 makepkg: fix testing for built package presence Commit c7e4d10d introduced a small error in the testing of whether a package is already built. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: scripts/makepkg.sh.in | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Reduce unnecessary get_name() function calls
by Dan McGee 21 Oct '09

21 Oct '09

alpm_pkg_get_name() gives us little benefit in backend code besides a NULL check on the package passed in; we could do that ourself if necessary. By changing to direct references in the cases where we are sure we have a valid package, we save a function call each time we need a package name. This function can't be inlined because it is externally accessible. This cuts the calls to get_name() from 1.3 million times in a pacman -Qu operation to around 2400. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- lib/libalpm/package.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/libalpm/package.c b/lib/libalpm/package.c index 572b863..83a2fb8 100644 --- a/lib/libalpm/package.c +++ b/lib/libalpm/package.c @@ -573,7 +573,7 @@ alpm_list_t SYMEXPORT *alpm_pkg_compute_requiredby(pmpkg_t *pkg) } pmpkg_t *cachepkg = i->data; if(_alpm_dep_edge(cachepkg, pkg)) { - const char *cachepkgname = alpm_pkg_get_name(cachepkg); + const char *cachepkgname = pkg->name; reqs = alpm_list_add(reqs, strdup(cachepkgname)); } } @@ -896,7 +896,7 @@ int _alpm_pkg_cmp(const void *p1, const void *p2) { pmpkg_t *pkg1 = (pmpkg_t *)p1; pmpkg_t *pkg2 = (pmpkg_t *)p2; - return(strcmp(alpm_pkg_get_name(pkg1), alpm_pkg_get_name(pkg2))); + return(strcmp(pkg1->name, pkg2->name)); } /* Test for existence of a package in a alpm_list_t* @@ -915,7 +915,7 @@ pmpkg_t *_alpm_pkg_find(alpm_list_t *haystack, const char *needle) for(lp = haystack; lp; lp = lp->next) { pmpkg_t *info = lp->data; - if(info && strcmp(alpm_pkg_get_name(info), needle) == 0) { + if(info && strcmp(info->name, needle) == 0) { return(info); } } -- 1.6.5.1

1 0

[pacman-dev] [PATCH] makepkg: fix testing for built package presence
by Allan McRae 21 Oct '09

21 Oct '09

Commit c7e4d10d introduced a small error in the testing of whether a package is already built. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 989b252..7e10eef 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1724,7 +1724,7 @@ pkgbase=${pkgbase:-${pkgname[0]}} if [ "$SPLITPKG" -eq 0 ]; then if [ $ -f "$PKGDEST/${pkgname}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT}" \ - -f "$PKGDEST/${pkgname}-${pkgver}-${pkgrel}-any${PKGEXT}" $ \ + -o -f "$PKGDEST/${pkgname}-${pkgver}-${pkgrel}-any${PKGEXT}" \) \ -a "$FORCE" -eq 0 -a "$SOURCEONLY" -eq 0 -a "$NOBUILD" -eq 0 ]; then if [ "$INSTALL" -eq 1 ]; then warning "$(gettext "A package has already been built, installing existing package...")" @@ -1740,7 +1740,7 @@ else somepkgbuilt=0 for pkg in ${pkgname[@]}; do if [ $ -f "$PKGDEST/${pkg}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT}" \ - -f "$PKGDEST/${pkg}-${pkgver}-${pkgrel}-any${PKGEXT}" $ ]; then + -o -f "$PKGDEST/${pkg}-${pkgver}-${pkgrel}-any${PKGEXT}" \) ]; then somepkgbuilt=1 else allpkgbuilt=0 -- 1.6.5.1

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.3.2-5-g5ffc1ad
by dan＠archlinux.org 21 Oct '09

21 Oct '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, maint has been updated via 5ffc1ad3cdb1ec252739c62c9d614aba468bb22c (commit) from da5fb3ee4f66dbdf0620bbb087fd759ddc9ae6e0 (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: po/zh_CN.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.3.2-76-g6c635d7
by dan＠archlinux.org 21 Oct '09

21 Oct '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 6c635d76a042add78f65f732928c2f10c2e5567a (commit) via c7e4d10df378ec12e9e47bb05120778ea98015e1 (commit) via 2020e6297b021946c31c1e46b6ede3c4734ef85d (commit) via 2c2596177d88a60cbef8154927f847ca214aadd0 (commit) via 3d67d9b16c53fe70c1b7149b5a6bfbbf17522ba3 (commit) via 5ffc1ad3cdb1ec252739c62c9d614aba468bb22c (commit) via 4281a1a7f2d24cfcf0997122cc75c216a17f3e5b (commit) via da5fb3ee4f66dbdf0620bbb087fd759ddc9ae6e0 (commit) from f9582c7df223e1eb4078e6db4e2d35dc0f2bf9be (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 6c635d76a042add78f65f732928c2f10c2e5567a Merge: c7e4d10df378ec12e9e47bb05120778ea98015e1 5ffc1ad3cdb1ec252739c62c9d614aba468bb22c Author: Dan McGee <dan(a)archlinux.org> Date: Tue Oct 20 22:29:20 2009 -0500 Merge branch 'maint' commit c7e4d10df378ec12e9e47bb05120778ea98015e1 Author: Allan McRae <allan(a)archlinux.org> Date: Mon Oct 12 00:13:16 2009 +1000 makepkg: allow overriding arch in split packages This allows building a mixture of binary and arch=any packages. Fixes FS#15955. The value of CARCH is no longer overridden to "any" in when arch=any is used and the assigning of the "any" arch is delayed to during the packaging stage. Adjustments were required to fix installing and checking for pre-built packages of varing arches. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 2020e6297b021946c31c1e46b6ede3c4734ef85d Author: Allan McRae <allan(a)archlinux.org> Date: Sun Oct 11 22:32:22 2009 +1000 makepkg: allow overriding pkgver and pkgrel in split packages Fixing a single package within a split package requires the overriding or pkgrel. In very rare (but existing) cases, it is useful to override pkgver. Partial fix for FS#15955. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 2c2596177d88a60cbef8154927f847ca214aadd0 Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Mon Oct 12 23:05:36 2009 +0200 dload.c : clear sigaction flag to make valgrind happy This fixes the following valgrind warning : ==26831== Syscall param rt_sigaction(act->sa_flags) points to uninitialised byte(s) ==26831== at 0x4282547: __libc_sigaction (in /lib/libc-2.10.1.so) ==26831== by 0x403C693: download_internal (dload.c:152) ==26831== by 0x403D0E4: _alpm_download_single_file (dload.c:311) ==26831== by 0x4033B72: alpm_db_update (be_files.c:319) ==26831== by 0x805205E: pacman_sync (sync.c:257) ==26831== by 0x804EE54: main (pacman.c:1120) ==26831== Address 0xbec6cc04 is on thread 1's stack ==26831== ==26831== Syscall param rt_sigaction(act->sa_restorer) points to uninitialised byte(s) ==26831== at 0x4282547: __libc_sigaction (in /lib/libc-2.10.1.so) ==26831== by 0x403C693: download_internal (dload.c:152) ==26831== by 0x403D0E4: _alpm_download_single_file (dload.c:311) ==26831== by 0x4033B72: alpm_db_update (be_files.c:319) ==26831== by 0x805205E: pacman_sync (sync.c:257) ==26831== by 0x804EE54: main (pacman.c:1120) ==26831== Address 0xbec6cc08 is on thread 1's stack ==26831== Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 3d67d9b16c53fe70c1b7149b5a6bfbbf17522ba3 Author: Cedric Staniewski <cedric(a)gmx.ca> Date: Tue Oct 20 15:44:00 2009 +0200 makepkg, repo-add: replace external commands with bash substitutions where possible This also removes the awk dependency from makepkg and repo-add. Signed-off-by: Cedric Staniewski <cedric(a)gmx.ca> Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 4281a1a7f2d24cfcf0997122cc75c216a17f3e5b Author: Laszlo Papp <djszapi(a)archlinux.us> Date: Sat Oct 17 23:12:19 2009 +0200 Size handling was changed in fgets() functions Pacman's fgets function in the API used hardcoded numbers to identify the size. This is not good practice, so replace them with sizeof handling. Signed-off-by: Laszlo Papp <djszapi(a)archlinux.us> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: PKGBUILD-split.proto | 3 ++ doc/PKGBUILD.5.txt | 6 ++-- lib/libalpm/be_files.c | 49 +++++++++++++------------- lib/libalpm/dload.c | 1 + lib/libalpm/trans.c | 3 +- po/el.po | 8 ++-- po/zh_CN.po | 4 +- scripts/makepkg.sh.in | 91 +++++++++++++++++++++++++++-------------------- scripts/repo-add.sh.in | 6 ++- src/pacman/util.c | 3 +- 10 files changed, 98 insertions(+), 76 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] zh_CN issues in makepkg
by Allan McRae 20 Oct '09

20 Oct '09

Hi, Currently makepkg can not run in zh_CN due to (at least) this translated string: msgid "Extracting %s with %s" msgstr "正在使用 %2$s 解压缩 %1$s" The issue is due to bash not being able to handle positional parameters (1$ and 2$) as "$" are special characters to bash. Is there a way to translate this string without changing the order of the strings? Allan

2 2