- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] Remove three unnecessary usages of alpm_list_count()
by Dan McGee 24 Jun '11

24 Jun '11

For the files count when loading from a package, we can keep a counter. The two in the frontend were completely useless due to the fact that if sync_dbs is non-NULL, alpm_list_count() will always be greater than 0. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- lib/libalpm/be_package.c | 5 +++-- src/pacman/query.c | 2 +- src/pacman/sync.c | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/libalpm/be_package.c b/lib/libalpm/be_package.c index 1807051..748f27a 100644 --- a/lib/libalpm/be_package.c +++ b/lib/libalpm/be_package.c @@ -241,6 +241,7 @@ pmpkg_t *_alpm_pkg_load_internal(pmhandle_t *handle, const char *pkgfile, struct archive_entry *entry; pmpkg_t *newpkg = NULL; struct stat st; + size_t files_count = 0; if(pkgfile == NULL || strlen(pkgfile) == 0) { RET_ERR(handle, PM_ERR_WRONG_ARGS, NULL); @@ -328,6 +329,7 @@ pmpkg_t *_alpm_pkg_load_internal(pmhandle_t *handle, const char *pkgfile, } else if(full) { /* Keep track of all files for filelist generation */ newpkg->files = alpm_list_add(newpkg->files, strdup(entry_name)); + files_count++; } if(archive_read_data_skip(archive)) { @@ -366,8 +368,7 @@ pmpkg_t *_alpm_pkg_load_internal(pmhandle_t *handle, const char *pkgfile, if(full) { /* "checking for conflicts" requires a sorted list, ensure that here */ _alpm_log(handle, PM_LOG_DEBUG, "sorting package filelist for %s\n", pkgfile); - newpkg->files = alpm_list_msort(newpkg->files, alpm_list_count(newpkg->files), - _alpm_str_cmp); + newpkg->files = alpm_list_msort(newpkg->files, files_count, _alpm_str_cmp); newpkg->infolevel = INFRQ_ALL; } else { /* get rid of any partial filelist we may have collected, it is invalid */ diff --git a/src/pacman/query.c b/src/pacman/query.c index aa77907..62472cb 100644 --- a/src/pacman/query.c +++ b/src/pacman/query.c @@ -502,7 +502,7 @@ int pacman_query(alpm_list_t *targets) if(config->op_q_foreign) { /* ensure we have at least one valid sync db set up */ alpm_list_t *sync_dbs = alpm_option_get_syncdbs(config->handle); - if(sync_dbs == NULL || alpm_list_count(sync_dbs) == 0) { + if(sync_dbs == NULL) { pm_printf(PM_LOG_ERROR, _("no usable package repositories configured.\n")); return 1; } diff --git a/src/pacman/sync.c b/src/pacman/sync.c index acb8a33..6c86bd1 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -911,7 +911,7 @@ int pacman_sync(alpm_list_t *targets) /* ensure we have at least one valid sync db set up */ sync_dbs = alpm_option_get_syncdbs(config->handle); - if(sync_dbs == NULL || alpm_list_count(sync_dbs) == 0) { + if(sync_dbs == NULL) { pm_printf(PM_LOG_ERROR, _("no usable package repositories configured.\n")); return 1; } -- 1.7.5.4

2 1

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.5.3-303-gac7d17f
by dan＠archlinux.org 24 Jun '11

24 Jun '11

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 ac7d17f88e200f3f1c213474e7b875ecd341753d (commit) via d8d287b4d215eceb382385b84495666f5a03399e (commit) via d62a429b924e70f48bf021d3c355dd9455d1c45b (commit) via c699c0b15466343099d24caa644aba903edabd1a (commit) via 963b942bb91d798ac54cad8a36088fcb7abab278 (commit) via a4a7006a138f05c1b774414a55ffb5499d7b289f (commit) via 78f297dabe17eef518eaccb880f9013641124cda (commit) via fa3aa6441c9a8a4ac460e11d18b4ed3b0ae543b8 (commit) via eedd56f320c175c430ead9226dc871a9ce04ba3f (commit) via aa89a65a83bbac5487fff377cd6ac969e1796542 (commit) via 54ef162a1a9e27e362732d873f0739bc0a2cf1bf (commit) from 886a31ef205923fd5b29012ee75932a2e2dec4bd (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 ac7d17f88e200f3f1c213474e7b875ecd341753d Merge: d8d287b d62a429 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Jun 23 23:44:35 2011 -0500 Merge branch 'po-split' commit d8d287b4d215eceb382385b84495666f5a03399e Author: Dave Reisner <d(a)falconindy.com> Date: Wed Jun 22 09:30:35 2011 -0400 repo-add: fix path designation regression b899099 made path checking a bit more strict than I had intended, and would actually forbid creation of a repo in $PWD if only the filename was specified. readlink would be the fun and easy solution here, but it's avoided due to portability issues, making the validation process a bit more verbose. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit d62a429b924e70f48bf021d3c355dd9455d1c45b Author: Dan McGee <dan(a)archlinux.org> Date: Thu Jun 23 22:25:16 2011 -0500 scripts/po/: add pacman-key This has gettext strings, but wasn't added to the list of files in POTFILES.in just yet. Add it and update the catalogs. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit c699c0b15466343099d24caa644aba903edabd1a Author: Dan McGee <dan(a)archlinux.org> Date: Thu Jun 23 22:01:20 2011 -0500 src/pacman/po/: prune message catalog and translations Now that we have performed the split, prune the catalogs of all scripts-only messages. All old messages were pruned from the files using the following command: sed -i -e '/^#\~/,$d' *.po Note: the diff on this commit looks much less insane if the --patience option is used. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 963b942bb91d798ac54cad8a36088fcb7abab278 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Jun 23 21:58:18 2011 -0500 scripts/po/: prune message catalog and translations Now that we have performed the split, prune the catalogs of all pacman-only messages. All old messages were pruned from the files using the following command: sed -i -e '/^#\~/,' *.po Note: the diff on this commit looks much less insane if the --patience option is used. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit a4a7006a138f05c1b774414a55ffb5499d7b289f Author: Dan McGee <dan(a)archlinux.org> Date: Thu Jun 23 21:21:51 2011 -0500 po/: split into scripts/po/ and src/pacman/po/ This is the first step at separating the pacman message catalog and the scripts message catalog. Makefiles, configure.ac, and other such files are adjusted accordingly, as well as renaming files. The TEXTDOMAIN of scripts is also adjusted. Note that no actual pot or po files get changed here; these will get pruned in a future commit so each catalog contains only the necessary messages. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 78f297dabe17eef518eaccb880f9013641124cda Author: Dan McGee <dan(a)archlinux.org> Date: Thu Jun 23 21:48:35 2011 -0500 Update all translation files This is for the eventual 4.0.0 release, but more importantly to logically separate new translations and strings from the PO split about to happen between pacman and scripts. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit fa3aa6441c9a8a4ac460e11d18b4ed3b0ae543b8 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Jun 23 22:22:57 2011 -0500 Let configure gettext setup know we use ngettext() Signed-off-by: Dan McGee <dan(a)archlinux.org> commit eedd56f320c175c430ead9226dc871a9ce04ba3f Author: Eric Bélanger <snowmaniscool(a)gmail.com> Date: Thu Jun 23 00:02:33 2011 -0400 makepkg: Added checks in check_software for distcc, ccache, strip and gzip Dan: slightly shorten some of the messages. Signed-off-by: Eric Bélanger <snowmaniscool(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit aa89a65a83bbac5487fff377cd6ac969e1796542 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Jun 23 15:19:01 2011 -0500 makepkg: remove distcc/makeflags option interaction Way back in c94bfbaba when refactoring makepkg options handling, I added these lines to unset MAKEFLAGS if '!distcc' was set in a PKGBUILD (not taking into account makepkg.conf settings). This was an attempt to say "if it is broken in distcc, it is probably broken even more". However, this is silly as one should be using '!makeflags' as well. Remove the linkage. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 54ef162a1a9e27e362732d873f0739bc0a2cf1bf Author: Dan McGee <dan(a)archlinux.org> Date: Thu Jun 16 13:15:11 2011 -0500 Convert backup list to new pmbackup_t type This allows us to separate the name and hash elements in one place and not scatter different parsing code all over the place, including both the frontend and backend. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: Makefile.am | 2 +- configure.ac | 5 +- lib/libalpm/add.c | 67 +- lib/libalpm/alpm.h | 6 + lib/libalpm/backup.c | 80 +- lib/libalpm/backup.h | 8 +- lib/libalpm/be_local.c | 12 +- lib/libalpm/be_package.c | 5 +- lib/libalpm/package.c | 7 +- lib/libalpm/package.h | 1 + lib/libalpm/po/Makevars | 2 +- lib/libalpm/po/ca.po | 57 +- lib/libalpm/po/cs.po | 57 +- lib/libalpm/po/da.po | 51 +- lib/libalpm/po/de.po | 57 +- lib/libalpm/po/el.po | 57 +- lib/libalpm/po/en_GB.po | 57 +- lib/libalpm/po/es.po | 57 +- lib/libalpm/po/fi.po | 58 +- lib/libalpm/po/fr.po | 58 +- lib/libalpm/po/hu.po | 57 +- lib/libalpm/po/it.po | 59 +- lib/libalpm/po/kk.po | 57 +- lib/libalpm/po/libalpm.pot | 42 +- lib/libalpm/po/nb.po | 57 +- lib/libalpm/po/pl.po | 57 +- lib/libalpm/po/pt.po | 57 +- lib/libalpm/po/pt_BR.po | 57 +- lib/libalpm/po/ro.po | 61 +- lib/libalpm/po/ru.po | 57 +- lib/libalpm/po/sk.po | 58 +- lib/libalpm/po/sr.po | 57 +- lib%2Flibalpm%2Fpo%2Fsr(a)latin.po | 57 +- lib/libalpm/po/sv.po | 51 +- lib/libalpm/po/tr.po | 57 +- lib/libalpm/po/uk.po | 51 +- lib/libalpm/po/zh_CN.po | 57 +- lib/libalpm/remove.c | 22 +- po/POTFILES.in | 21 - po/ca.po | 1946 ------------------- po/cs.po | 1888 ------------------- po/da.po | 1866 ------------------ po/de.po | 1961 ------------------- po/el.po | 1896 ------------------- po/en_GB.po | 1874 ------------------- po/es.po | 1955 ------------------- po/fi.po | 1914 ------------------- po/fr.po | 1957 ------------------- po/hu.po | 1924 ------------------- po/it.po | 1952 ------------------- po/kk.po | 1894 ------------------- po/nb.po | 1894 ------------------- po/pacman.pot | 1784 ------------------ po/pl.po | 1901 ------------------- po/pt.po | 1972 -------------------- po/pt_BR.po | 1947 ------------------- po/ro.po | 1954 ------------------- po/ru.po | 1912 ------------------- po/sk.po | 1891 ------------------- po/sr.po | 1888 ------------------- po%2Fsr(a)latin.po | 1892 ------------------- po/sv.po | 1871 ------------------- po/tr.po | 1907 ------------------- po/uk.po | 1878 ------------------- po/zh_CN.po | 1822 ------------------ scripts/Makefile.am | 2 + scripts/makepkg.sh.in | 37 +- scripts/pacman-db-upgrade.sh.in | 2 +- scripts/pacman-key.sh.in | 2 +- scripts/pacman-optimize.sh.in | 2 +- scripts/pkgdelta.sh.in | 2 +- {po => scripts/po}/.gitignore | 0 {po => scripts/po}/LINGUAS | 0 {po => scripts/po}/Makefile.in.in | 0 {lib/libalpm => scripts}/po/Makevars | 6 +- scripts/po/POTFILES.in | 9 + scripts/po/ca.po | 1067 +++++++++++ scripts/po/cs.po | 1020 ++++++++++ scripts/po/da.po | 1018 ++++++++++ scripts/po/de.po | 1075 +++++++++++ scripts/po/el.po | 1030 ++++++++++ scripts/po/en_GB.po | 1018 ++++++++++ scripts/po/es.po | 1056 +++++++++++ scripts/po/fi.po | 1056 +++++++++++ scripts/po/fr.po | 1076 +++++++++++ scripts/po/hu.po | 1065 +++++++++++ scripts/po/it.po | 1072 +++++++++++ scripts/po/kk.po | 1044 +++++++++++ scripts/po/nb.po | 1028 ++++++++++ scripts/po/pacman-scripts.pot | 943 ++++++++++ scripts/po/pl.po | 1026 ++++++++++ scripts/po/pt.po | 1079 +++++++++++ scripts/po/pt_BR.po | 1070 +++++++++++ {po => scripts/po}/remove-potcdate.sin | 0 scripts/po/ro.po | 1060 +++++++++++ scripts/po/ru.po | 1055 +++++++++++ scripts/po/sk.po | 1023 ++++++++++ scripts/po/sr.po | 1026 ++++++++++ scripts%2Fpo%2Fsr(a)latin.po | 1028 ++++++++++ scripts/po/sv.po | 1021 ++++++++++ scripts/po/tr.po | 1050 +++++++++++ scripts/po/uk.po | 1025 ++++++++++ scripts/po/zh_CN.po | 1003 ++++++++++ scripts/repo-add.sh.in | 15 +- src/pacman/Makefile.am | 2 + src/pacman/package.c | 19 +- {lib/libalpm => src/pacman}/po/.gitignore | 0 {lib/libalpm => src/pacman}/po/LINGUAS | 0 {lib/libalpm => src/pacman}/po/Makefile.in.in | 0 {po => src/pacman/po}/Makevars | 4 +- src/pacman/po/POTFILES.in | 14 + src/pacman/po/ca.po | 1154 ++++++++++++ src/pacman/po/cs.po | 1130 +++++++++++ src/pacman/po/da.po | 1117 +++++++++++ src/pacman/po/de.po | 1153 ++++++++++++ src/pacman/po/el.po | 1127 +++++++++++ src/pacman/po/en_GB.po | 1117 +++++++++++ src/pacman/po/es.po | 1173 ++++++++++++ src/pacman/po/fi.po | 1123 +++++++++++ src/pacman/po/fr.po | 1163 ++++++++++++ src/pacman/po/hu.po | 1131 +++++++++++ src/pacman/po/it.po | 1153 ++++++++++++ src/pacman/po/kk.po | 1118 +++++++++++ src/pacman/po/nb.po | 1124 +++++++++++ src/pacman/po/pacman.pot | 1070 +++++++++++ src/pacman/po/pl.po | 1138 +++++++++++ src/pacman/po/pt.po | 1167 ++++++++++++ src/pacman/po/pt_BR.po | 1153 ++++++++++++ {lib/libalpm => src/pacman}/po/remove-potcdate.sin | 0 src/pacman/po/ro.po | 1163 ++++++++++++ src/pacman/po/ru.po | 1133 +++++++++++ src/pacman/po/sk.po | 1130 +++++++++++ src/pacman/po/sr.po | 1125 +++++++++++ src%2Fpacman%2Fpo%2Fsr(a)latin.po | 1127 +++++++++++ src/pacman/po/sv.po | 1116 +++++++++++ src/pacman/po/tr.po | 1120 +++++++++++ src/pacman/po/uk.po | 1127 +++++++++++ src/pacman/po/zh_CN.po | 1085 +++++++++++ 138 files changed, 57572 insertions(+), 50251 deletions(-) delete mode 100644 po/POTFILES.in delete mode 100644 po/ca.po delete mode 100644 po/cs.po delete mode 100644 po/da.po delete mode 100644 po/de.po delete mode 100644 po/el.po delete mode 100644 po/en_GB.po delete mode 100644 po/es.po delete mode 100644 po/fi.po delete mode 100644 po/fr.po delete mode 100644 po/hu.po delete mode 100644 po/it.po delete mode 100644 po/kk.po delete mode 100644 po/nb.po delete mode 100644 po/pacman.pot delete mode 100644 po/pl.po delete mode 100644 po/pt.po delete mode 100644 po/pt_BR.po delete mode 100644 po/ro.po delete mode 100644 po/ru.po delete mode 100644 po/sk.po delete mode 100644 po/sr.po delete mode 100644 po%2Fsr(a)latin.po delete mode 100644 po/sv.po delete mode 100644 po/tr.po delete mode 100644 po/uk.po delete mode 100644 po/zh_CN.po rename {po => scripts/po}/.gitignore (100%) rename {po => scripts/po}/LINGUAS (100%) rename {po => scripts/po}/Makefile.in.in (100%) copy {lib/libalpm => scripts}/po/Makevars (93%) create mode 100644 scripts/po/POTFILES.in create mode 100644 scripts/po/ca.po create mode 100644 scripts/po/cs.po create mode 100644 scripts/po/da.po create mode 100644 scripts/po/de.po create mode 100644 scripts/po/el.po create mode 100644 scripts/po/en_GB.po create mode 100644 scripts/po/es.po create mode 100644 scripts/po/fi.po create mode 100644 scripts/po/fr.po create mode 100644 scripts/po/hu.po create mode 100644 scripts/po/it.po create mode 100644 scripts/po/kk.po create mode 100644 scripts/po/nb.po create mode 100644 scripts/po/pacman-scripts.pot create mode 100644 scripts/po/pl.po create mode 100644 scripts/po/pt.po create mode 100644 scripts/po/pt_BR.po rename {po => scripts/po}/remove-potcdate.sin (100%) create mode 100644 scripts/po/ro.po create mode 100644 scripts/po/ru.po create mode 100644 scripts/po/sk.po create mode 100644 scripts/po/sr.po create mode 100644 scripts%2Fpo%2Fsr(a)latin.po create mode 100644 scripts/po/sv.po create mode 100644 scripts/po/tr.po create mode 100644 scripts/po/uk.po create mode 100644 scripts/po/zh_CN.po copy {lib/libalpm => src/pacman}/po/.gitignore (100%) copy {lib/libalpm => src/pacman}/po/LINGUAS (100%) copy {lib/libalpm => src/pacman}/po/Makefile.in.in (100%) rename {po => src/pacman/po}/Makevars (95%) create mode 100644 src/pacman/po/POTFILES.in create mode 100644 src/pacman/po/ca.po create mode 100644 src/pacman/po/cs.po create mode 100644 src/pacman/po/da.po create mode 100644 src/pacman/po/de.po create mode 100644 src/pacman/po/el.po create mode 100644 src/pacman/po/en_GB.po create mode 100644 src/pacman/po/es.po create mode 100644 src/pacman/po/fi.po create mode 100644 src/pacman/po/fr.po create mode 100644 src/pacman/po/hu.po create mode 100644 src/pacman/po/it.po create mode 100644 src/pacman/po/kk.po create mode 100644 src/pacman/po/nb.po create mode 100644 src/pacman/po/pacman.pot create mode 100644 src/pacman/po/pl.po create mode 100644 src/pacman/po/pt.po create mode 100644 src/pacman/po/pt_BR.po copy {lib/libalpm => src/pacman}/po/remove-potcdate.sin (100%) create mode 100644 src/pacman/po/ro.po create mode 100644 src/pacman/po/ru.po create mode 100644 src/pacman/po/sk.po create mode 100644 src/pacman/po/sr.po create mode 100644 src%2Fpacman%2Fpo%2Fsr(a)latin.po create mode 100644 src/pacman/po/sv.po create mode 100644 src/pacman/po/tr.po create mode 100644 src/pacman/po/uk.po create mode 100644 src/pacman/po/zh_CN.po hooks/post-receive -- The official pacman repository

2 1

[pacman-dev] Fwd: [PATCH 8/9] repo-add: move command invocation out of arg parsing loop
by Dave Reisner 24 Jun '11

24 Jun '11

Forwarding this, as it seems to have been eaten by gmail as well on the initial send... d ----- Forwarded message from Dave Reisner <d(a)falconindy.com> ----- > Date: Wed, 22 Jun 2011 20:38:52 -0400 > From: Dave Reisner <d(a)falconindy.com> > To: pacman-dev(a)archlinux.org > Cc: Dave Reisner <d(a)falconindy.com> > Subject: [PATCH 8/9] repo-add: move command invocation out of arg parsing loop > > This is mostly a move to make the code easier to read, but it's my feeling > that the arg parsing loop should parse args, and the actual program logic > should be separated from this. > > Signed-off-by: Dave Reisner <d(a)falconindy.com> > --- > scripts/repo-add.sh.in | 23 ++++++++++++----------- > 1 files changed, 12 insertions(+), 11 deletions(-) > > diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in > index e75055f..8865188 100644 > --- a/scripts/repo-add.sh.in > +++ b/scripts/repo-add.sh.in > @@ -529,9 +529,10 @@ trap 'trap_exit "$(gettext "TERM signal caught. Exiting...")"' TERM HUP QUIT > trap 'trap_exit "$(gettext "Aborted by user! Exiting...")"' INT > trap 'trap_exit "$(gettext "An unknown error has occured. Exiting...")"' ERR > > +declare -a args > success=0 > # parse arguments > -while [[ $# > 0 ]]; do > +while (( $# )); do > case "$1" in > -q|--quiet) QUIET=1;; > -d|--delta) DELTA=1;; > @@ -562,21 +563,21 @@ while [[ $# > 0 ]]; do > VERIFY=1 > ;; > *) > - if [[ -z $REPO_DB_FILE ]]; then > - REPO_DB_FILE="$1" > - LOCKFILE="$REPO_DB_FILE.lck" > - check_repo_db > - else > - case "$cmd" in > - repo-add) add $1 && success=1 ;; > - repo-remove) remove $1 && success=1 ;; > - esac > - fi > + args+=("$1") > ;; > esac > shift > done > > +REPO_DB_FILE=${args[0]} > +LOCKFILE=$REPO_DB_FILE.lck > +check_repo_db > + > +# we've already validated our command -- just trim it to get the function > +for arg in "${args[@]:1}"; do > + "${cmd#repo-}" "$arg" && success=1 > +done > + > # if at least one operation was a success, re-zip database > if (( success )); then > msg "$(gettext "Creating updated database file '%s'")" "$REPO_DB_FILE" > -- > 1.7.5.4 > ----- End forwarded message -----

2 1

[pacman-dev] [PATCH] makepkg: Added checks in check_software for distcc, ccache, strip and gzip
by Eric Bélanger 24 Jun '11

24 Jun '11

Signed-off-by: Eric Bélanger <snowmaniscool(a)gmail.com> --- I thought about adding checks for the PKGEXT and SRCEXT compression utilities but I'm not sure as it might be overkill. Anyway, they could always be added later on in another patch. BTW, I didn't test this patch as it seemed quite straightforward. scripts/makepkg.sh.in | 32 ++++++++++++++++++++++++++++++++ 1 files changed, 32 insertions(+), 0 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 239bb64..e9b8c56 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1485,6 +1485,38 @@ check_software() { fi fi + # distcc - compilation with distcc + if [[ $(check_buildenv distcc) = "y" && $(check_option distcc) != "n" ]]; then + if ! type -p distcc >/dev/null; then + error "$(gettext "Cannot find the %s binary required for distributed compilation.")" "distcc" + ret=1 + fi + fi + + # ccache - compilation with ccache + if [[ $(check_buildenv ccache) = "y" && $(check_option ccache) != "n" ]]; then + if ! type -p ccache >/dev/null; then + error "$(gettext "Cannot find the %s binary required for compilation with compiler cache.")" "ccache" + ret=1 + fi + fi + + # strip - strip symbols from binaries/libraries + if [[ $(check_option strip) = y ]]; then + if ! type -p strip >/dev/null; then + error "$(gettext "Cannot find the %s binary required for stripping unneeded symbols from binaries and libraries.")" "strip" + ret=1 + fi + fi + + # gzip - compressig man and info pages + if [[ $(check_option zipman) = "y" ]]; then + if ! type -p gzip >/dev/null; then + error "$(gettext "Cannot find the %s binary required for compressing man and info pages.")" "gzip" + ret=1 + fi + fi + return $ret } -- 1.7.5.4

2 2

[pacman-dev] [PATCH] makepkg: remove distcc/makeflags option interaction
by Dan McGee 23 Jun '11

23 Jun '11

Way back in c94bfbaba when refactoring makepkg options handling, I added these lines to unset MAKEFLAGS if '!distcc' was set in a PKGBUILD (not taking into account makepkg.conf settings). This was an attempt to say "if it is broken in distcc, it is probably broken even more". However, this is silly as one should be using '!makeflags' as well. Remove the linkage. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- scripts/makepkg.sh.in | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 239bb64..cd94ac9 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -822,9 +822,6 @@ run_build() { if [[ $(check_buildenv distcc) = "y" && $(check_option distcc) != "n" ]]; then [[ -d /usr/lib/distcc/bin ]] && export PATH="/usr/lib/distcc/bin:$PATH" export DISTCC_HOSTS - elif [[ $(check_option distcc) = "n" ]]; then - # if it is not wanted, clear the makeflags too - MAKEFLAGS="" fi # use ccache if it is requested (check buildenv and PKGBUILD opts) -- 1.7.5.4

2 1

[pacman-dev] Discussion about deprecating/removing the changelog feature from pacman.
by Thomas Dziedzic 23 Jun '11

23 Jun '11

I would like to bring up a point which has been annoying me for a while and I would like to get it out there. I will argue that the changelog feature is unnecessary in pacman/PKGBUILDs. 1.) It's a feature rarely used by anyone, e.g. there are changelogs which exist which haven't been updated in years which I encounter and remove right away. 2.)Svn log usually serves the same purpose, and I can not think of any benefits changelogs provide over svn log. 3.)I can not think of one package I have encountered that included a useful changelog. Some ways to go about removing it are: declare deprecated -> remove after some time or just remove changelog support right away The last option might be viable given its small audience.

8 11

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.5.3-292-g886a31e
by dan＠archlinux.org 22 Jun '11

22 Jun '11

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 886a31ef205923fd5b29012ee75932a2e2dec4bd (commit) from 85902d98e831d79dfef1bd3cc7099c6dba806e8a (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 886a31ef205923fd5b29012ee75932a2e2dec4bd Author: Dan McGee <dan(a)archlinux.org> Date: Wed Jun 22 11:51:58 2011 -0500 makepkg: fix 'check_sofware' typo Allan broke it! Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: scripts/makepkg.sh.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.5.3-291-g85902d9
by dan＠archlinux.org 22 Jun '11

22 Jun '11

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 85902d98e831d79dfef1bd3cc7099c6dba806e8a (commit) via 3d4bf3b3fdabb721ab4be23e6ca26e8fa5bb9806 (commit) via 74689562363b3dec2a97ce095295a5222562061d (commit) via e97541c2083205a81f46225c367a9f470c702dd1 (commit) via 41f9fa9bed15b9e01b78edcea83b9c81679be3bf (commit) via 3497eb4e2c1bf3869176f944ba97c289bebf2e30 (commit) via 508b360c24ddfdb79f66cc14b197988a829b0ecd (commit) via b803a33a8fc2ef86ba2d986c36f31524532d454b (commit) from b8990993271b34d309ada49197090895b0fbdfb6 (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 85902d98e831d79dfef1bd3cc7099c6dba806e8a Author: Dave Reisner <d(a)falconindy.com> Date: Mon Jun 20 16:38:57 2011 -0400 repo-add: style cleanup Unify function braces to be top right opening, bottom left closing. Signed-off-by: Dave Reisner <d(a)falconindy.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 3d4bf3b3fdabb721ab4be23e6ca26e8fa5bb9806 Author: Kerrick Staley <mail(a)kerrickstaley.com> Date: Wed Jun 22 00:32:57 2011 -0500 Fixed outdated documentation in test/pacman/README test/pacman/README mentioned the -A flag, which no longer exists. Signed-off-by: Kerrick Staley <mail(a)kerrickstaley.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 74689562363b3dec2a97ce095295a5222562061d Author: Allan McRae <allan(a)archlinux.org> Date: Tue Jun 21 13:02:07 2011 +1000 makepkg: add software check function Add a function that checks for the software needed by makepkg to process a PKGBUILD with the requested options. This allows makepkg to bail early in the packaging process. Many other checks can be added to this function... Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit e97541c2083205a81f46225c367a9f470c702dd1 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Jun 21 12:27:21 2011 +1000 Remove old TODO lists These had not been touched since 2007 and had lost most of their relevance. The bug tracker is a better place for the filing of ideas. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 41f9fa9bed15b9e01b78edcea83b9c81679be3bf Author: Allan McRae <allan(a)archlinux.org> Date: Thu Jun 16 19:57:31 2011 +1000 makepkg: move comment into correct place Oops... Introduced by commit d21f6ca4. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 3497eb4e2c1bf3869176f944ba97c289bebf2e30 Author: Allan McRae <allan(a)archlinux.org> Date: Wed Jun 15 21:59:06 2011 +1000 makepkg: adjust libprovides/depends messages Contractions are less clear for non-native speakers so should be avoided (and cause syntax highlighting issues). Also, the 'provides' and 'depends' strings are not to be translated. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 508b360c24ddfdb79f66cc14b197988a829b0ecd Author: Allan McRae <allan(a)archlinux.org> Date: Wed Jun 15 14:32:42 2011 +1000 makepkg: allow specifying alternative build directory Add a BUILDDIR variable (which can be overridden in the environment) to specify an alternative location for building the package. This is useful for people who want to build on a different filesystem for improved performance (e.g. tmpfs). Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit b803a33a8fc2ef86ba2d986c36f31524532d454b Author: Allan McRae <allan(a)archlinux.org> Date: Tue Jun 14 22:01:05 2011 +1000 makepkg: Add UPX compression support This patch enables the automatic compression of executable binaries using UPX when the 'upx' options is specified in makepkg.conf or the PKGBUILD. Additional arguments can be passed to UPX by specifying the UPXFLAGS variable. Original-patch-by: Bryce Gibson <bryce(a)gibson-consulting.com.au> Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: TODO.aaron | 57 -------------------------- TODO.dan | 95 -------------------------------------------- doc/PKGBUILD.5.txt | 3 + doc/makepkg.8.txt | 3 + doc/makepkg.conf.5.txt | 14 ++++++- etc/makepkg.conf.in | 8 +++- scripts/makepkg.sh.in | 103 ++++++++++++++++++++++++++++++++++++------------ scripts/repo-add.sh.in | 24 ++++------- test/pacman/README | 6 +- 9 files changed, 114 insertions(+), 199 deletions(-) delete mode 100644 TODO.aaron delete mode 100644 TODO.dan hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Unify modelines in Asciidoc files
by Dan McGee 22 Jun '11

22 Jun '11

This gets us close to using the same modeline in all files we run through Asciidoc, as well as adding the spell and spelllang declarations, just as we had in NEWS already. The choice of 'en_us' is mainly for consistency and because the body of work already uses these spellings. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- HACKING | 2 +- doc/PKGBUILD.5.txt | 2 +- doc/footer.txt | 2 +- doc/index.txt | 10 +++++----- doc/libalpm.3.txt | 2 +- doc/makepkg.8.txt | 2 +- doc/makepkg.conf.5.txt | 2 +- doc/pacman-key.8.txt | 2 +- doc/pacman.8.txt | 2 +- doc/pacman.conf.5.txt | 2 +- doc/pkgdelta.8.txt | 2 +- doc/repo-add.8.txt | 2 +- doc/submitting-patches.txt | 6 +++--- doc/translation-help.txt | 34 +++++++++++++++++----------------- doc/vercmp.8.txt | 2 +- 15 files changed, 37 insertions(+), 37 deletions(-) diff --git a/HACKING b/HACKING index 2df7ecc..6692f7e 100644 --- a/HACKING +++ b/HACKING @@ -147,5 +147,5 @@ For example, to run valgrind: valgrind --leak-check=full -- src/pacman/.libs/lt-pacman -Syu ///// -vim: set ts=2 sw=2 syntax=asciidoc et: +vim:set ts=4 sw=4 syntax=asciidoc noet spell spelllang=en_us: ///// diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt index 4d76121..8dcf491 100644 --- a/doc/PKGBUILD.5.txt +++ b/doc/PKGBUILD.5.txt @@ -1,5 +1,5 @@ ///// -vim:set ts=4 sw=4 syntax=asciidoc noet: +vim:set ts=4 sw=4 syntax=asciidoc noet spell spelllang=en_us: ///// PKGBUILD(5) =========== diff --git a/doc/footer.txt b/doc/footer.txt index 2ffb009..a132542 100644 --- a/doc/footer.txt +++ b/doc/footer.txt @@ -1,5 +1,5 @@ ///// -vim:set ts=4 sw=4 syntax=asciidoc noet: +vim:set ts=4 sw=4 syntax=asciidoc noet spell spelllang=en_us: ///// See the pacman website at http://www.archlinux.org/pacman/[] for current diff --git a/doc/index.txt b/doc/index.txt index 4cc8313..5fd3f3b 100644 --- a/doc/index.txt +++ b/doc/index.txt @@ -107,9 +107,9 @@ link:ftp://ftp.archlinux.org/other/pacman/[]. To install, download the newest available source tarball, unpack it in a directory, and run the three magic commands: - $ ./configure - $ make - # make install + $ ./configure + $ make + # make install You may wish to read the options presented by `./configure --help` in order to set appropriate paths and build options that are correct for your system. @@ -132,7 +132,7 @@ these trees). The current development tree can be fetched with the following command: - git clone git://projects.archlinux.org/pacman.git pacman + git clone git://projects.archlinux.org/pacman.git pacman which will fetch the full development history into a directory named pacman. You can browse the source as well using @@ -206,5 +206,5 @@ pacman is Copyright (C) 2006-2011 Pacman Development Team version 2 or later. ///// -vim: set ts=2 sw=2 syntax=asciidoc et: +vim:set ts=4 sw=4 syntax=asciidoc noet spell spelllang=en_us: ///// diff --git a/doc/libalpm.3.txt b/doc/libalpm.3.txt index b7a892c..e2ea32c 100644 --- a/doc/libalpm.3.txt +++ b/doc/libalpm.3.txt @@ -1,5 +1,5 @@ ///// -vim:set ts=4 sw=4 syntax=asciidoc noet: +vim:set ts=4 sw=4 syntax=asciidoc noet spell spelllang=en_us: ///// libalpm(3) ========== diff --git a/doc/makepkg.8.txt b/doc/makepkg.8.txt index f15226a..e59c5ff 100644 --- a/doc/makepkg.8.txt +++ b/doc/makepkg.8.txt @@ -1,5 +1,5 @@ ///// -vim:set ts=4 sw=4 syntax=asciidoc noet: +vim:set ts=4 sw=4 syntax=asciidoc noet spell spelllang=en_us: ///// makepkg(8) ========== diff --git a/doc/makepkg.conf.5.txt b/doc/makepkg.conf.5.txt index aa0174c..b93e4cd 100644 --- a/doc/makepkg.conf.5.txt +++ b/doc/makepkg.conf.5.txt @@ -1,5 +1,5 @@ ///// -vim:set ts=4 sw=4 syntax=asciidoc noet: +vim:set ts=4 sw=4 syntax=asciidoc noet spell spelllang=en_us: ///// makepkg.conf(5) =============== diff --git a/doc/pacman-key.8.txt b/doc/pacman-key.8.txt index 892f14d..24c9470 100644 --- a/doc/pacman-key.8.txt +++ b/doc/pacman-key.8.txt @@ -1,5 +1,5 @@ ///// -vim:set ts=4 sw=4 syntax=asciidoc noet: +vim:set ts=4 sw=4 syntax=asciidoc noet spell spelllang=en_us: ///// pacman-key(8) ============= diff --git a/doc/pacman.8.txt b/doc/pacman.8.txt index 531c992..8a6565f 100644 --- a/doc/pacman.8.txt +++ b/doc/pacman.8.txt @@ -1,5 +1,5 @@ ///// -vim:set ts=4 sw=4 syntax=asciidoc noet: +vim:set ts=4 sw=4 syntax=asciidoc noet spell spelllang=en_us: ///// pacman(8) ========= diff --git a/doc/pacman.conf.5.txt b/doc/pacman.conf.5.txt index bdf0bc8..308f471 100644 --- a/doc/pacman.conf.5.txt +++ b/doc/pacman.conf.5.txt @@ -1,5 +1,5 @@ ///// -vim:set ts=4 sw=4 syntax=asciidoc noet: +vim:set ts=4 sw=4 syntax=asciidoc noet spell spelllang=en_us: ///// pacman.conf(5) ============== diff --git a/doc/pkgdelta.8.txt b/doc/pkgdelta.8.txt index 2d99a87..3804c5d 100644 --- a/doc/pkgdelta.8.txt +++ b/doc/pkgdelta.8.txt @@ -1,5 +1,5 @@ ///// -vim:set ts=4 sw=4 syntax=asciidoc noet: +vim:set ts=4 sw=4 syntax=asciidoc noet spell spelllang=en_us: ///// pkgdelta(8) ========= diff --git a/doc/repo-add.8.txt b/doc/repo-add.8.txt index 0196882..919b906 100644 --- a/doc/repo-add.8.txt +++ b/doc/repo-add.8.txt @@ -1,5 +1,5 @@ ///// -vim:set ts=4 sw=4 syntax=asciidoc noet: +vim:set ts=4 sw=4 syntax=asciidoc noet spell spelllang=en_us: ///// repo-add(8) ========== diff --git a/doc/submitting-patches.txt b/doc/submitting-patches.txt index e6853c5..3428768 100644 --- a/doc/submitting-patches.txt +++ b/doc/submitting-patches.txt @@ -20,7 +20,7 @@ started with GIT if you have not worked with it before. The pacman code can be fetched using the following command: - git clone git://projects.archlinux.org/pacman.git + git clone git://projects.archlinux.org/pacman.git Creating your patch @@ -32,7 +32,7 @@ Creating your patch The -s allows you to credit yourself by adding a "Signed Off By" line to indicate who has "signed" the patch - who has approved it. - Signed-off-by: Aaron Griffin <aaron(a)archlinux.org> + Signed-off-by: Aaron Griffin <aaron(a)archlinux.org> Please use your real name and email address. Feel free to "scramble" the address if you're afraid of spam. @@ -94,5 +94,5 @@ aren't their own. -- ///// -vim: set ts=2 sw=2 syntax=asciidoc et: +vim:set ts=4 sw=4 syntax=asciidoc noet spell spelllang=en_us: ///// diff --git a/doc/translation-help.txt b/doc/translation-help.txt index d95b513..ef86dbf 100644 --- a/doc/translation-help.txt +++ b/doc/translation-help.txt @@ -40,15 +40,15 @@ not worried about any local translations being overwritten. The .tx/ directory is checked into the git repository so is preconfigured with the two project resources (See `tx status` output for a quick overview). - tx pull -f - poedit po/<mylang>.po - poedit lib/libalpm/po/<mylang>.po - tx push -t -l <mylang> + tx pull -f + poedit po/<mylang>.po + poedit lib/libalpm/po/<mylang>.po + tx push -t -l <mylang> Or to just push one of the two available resources: - tx push -r archlinux-pacman.pacman-pot -t -l fi - tx push -r archlinux-pacman.libalpm-pot -t -l fi + tx push -r archlinux-pacman.pacman-pot -t -l fi + tx push -r archlinux-pacman.libalpm-pot -t -l fi See the <<Notes,Notes>> section for additional hints on translating. @@ -79,7 +79,7 @@ Incremental Updates If you have more advanced needs you will have to get a copy of the pacman repository. - git clone git://projects.archlinux.org/pacman.git pacman + git clone git://projects.archlinux.org/pacman.git pacman Next, you will need to run `./autogen.sh` and `./configure` in the base directory to generate the correct Makefiles. At this point, all necessary @@ -91,11 +91,11 @@ We need to first update the main message catalog file. Navigate into either the work on first, and execute the following command. If you are working in the `po/` tree, replace 'libalpm.pot' with 'pacman.pot': - make libalpm.pot-update + make libalpm.pot-update Next, update your specific language's translation file: - make <po file>-update + make <po file>-update At this point, you can do the translation. To submit your changes, either email the new `.po` file to the mailing-list with *[translation]* in the subject, or @@ -104,7 +104,7 @@ submit a GIT-formatted patch (please do not include any `.pot` file changes). As a shortcut, all translation files (including `.pot` files) can be updated with the following command: - make update-po + make update-po Adding a New Language ~~~~~~~~~~~~~~~~~~~~~ @@ -133,16 +133,16 @@ msgid and msgstr 'variables' can be on as many lines as necessary. Line breaks are ignored- if you need a literal line break, use an `\n` in your string. The following two translations are equivalent: - msgstr "This is a test translation" + msgstr "This is a test translation" - msgstr "" - "This is a test translation" + msgstr "" + "This is a test translation" If you want to test the translation (for example, the frontend one): - rm *.gmo stamp-po - make - cp <lang code>.gmo /usr/share/locale/<lang code>/LC_MESSAGES/pacman.mo + rm *.gmo stamp-po + make + cp <lang code>.gmo /usr/share/locale/<lang code>/LC_MESSAGES/pacman.mo Translating Manpages @@ -160,5 +160,5 @@ check there first before undergoing a translation effort to ensure you are not duplicating efforts. ///// -vim: set ts=2 sw=2 syntax=asciidoc et: +vim:set ts=4 sw=4 syntax=asciidoc noet spell spelllang=en_us: ///// diff --git a/doc/vercmp.8.txt b/doc/vercmp.8.txt index f2fc530..a3bc561 100644 --- a/doc/vercmp.8.txt +++ b/doc/vercmp.8.txt @@ -1,5 +1,5 @@ ///// -vim:set ts=4 sw=4 syntax=asciidoc noet: +vim:set ts=4 sw=4 syntax=asciidoc noet spell spelllang=en_us: ///// vercmp(8) ========= -- 1.7.5.4

1 0

[pacman-dev] [PATCH 0/3] repo-add desc/depends creation cleanup
by Dave Reisner 22 Jun '11

22 Jun '11

This is basically what I referred to in my last patch about refactoring desc/depends writing. I snuck in an extra winner (the first) to get rid of the insane IFS tweaking and iteration of the .PKGINFO file with a for loop. Dan, I'm not sure if I can break this up any further, but I'm happy to refactor if it would make you more comfortable. I know it's an insanely important code path so I encourage you (and anyone else reading) to put on your nerd glasses and nitpick this. Dave Reisner (3): repo-add: bashify reading of .PKGINFO file repo-add: store multi-value fields as arrays repo-add: use format_entry for all desc/depends fields scripts/repo-add.sh.in | 105 +++++++++++++++++++++++------------------------ 1 files changed, 51 insertions(+), 54 deletions(-) -- 1.7.5.4

3 9