- Pacman-dev - lists.archlinux.org

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.2.2-93-g2268981
by dan＠archlinux.org 24 Feb '09

24 Feb '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 2268981ebf562a7dda1e788dbd931e48adf9fabb (commit) via 9d661240fe77127fbede95066f38f12cad598e2d (commit) via f57f8d33862050acc8d131710c100ba47877e675 (commit) via 02685504012a4880e599b15f1060f6bd0bf48797 (commit) via a309a016bfed9f67452f2a6556fb4391fd55b34e (commit) via c8a41b7d6da7f820754a07cb085687ea5e110f85 (commit) via c590ac0997b5c82ddf9115191e9ac5c79efde227 (commit) from 1c4633ea2cbc01cfd7929509724951615827c482 (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 2268981ebf562a7dda1e788dbd931e48adf9fabb Merge: 9d661240fe77127fbede95066f38f12cad598e2d a309a016bfed9f67452f2a6556fb4391fd55b34e Author: Dan McGee <dan(a)archlinux.org> Date: Mon Feb 23 20:40:27 2009 -0600 Merge branch 'maint' commit 9d661240fe77127fbede95066f38f12cad598e2d Author: Dan McGee <dan(a)archlinux.org> Date: Mon Feb 23 20:40:00 2009 -0600 Update pactest to use hashlib The md5 module is deprecated in favor of hashlib. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit f57f8d33862050acc8d131710c100ba47877e675 Author: Bryan Ischo <bryan(a)ischo.com> Date: Sun Feb 22 23:25:32 2009 +1300 Don't prompt the user for unignore of IgnorePkg/IgnoreGroup packages Don't prompt the user for unignore of IgnorePkg/IgnoreGroup packages, except for packages explicitly listed for sync by the user. This eliminates many unnecessary prompts when IgnorePkg/IgnoreGroup is used. Signed-off-by: Bryan Ischo <bryan(a)ischo.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 02685504012a4880e599b15f1060f6bd0bf48797 Author: Bryan Ischo <bryan(a)ischo.com> Date: Sun Feb 22 23:25:31 2009 +1300 Enabled new interactive prompt and updated some tests Enabled a new prompt to ask the user if they'd like to remove unresolvable packages from the transaction rather than failing it. Many pactest tests that used to fail now return success codes, because pacman now issues a prompt allowing the user to cancel rather than failing many transactions, and the pactest scripts always choose to cancel with no error rather than failing. The only net effect is that the return status of pacman is now 0 in cases where it used to be nonzero. Signed-off-by: Bryan Ischo <bryan(a)ischo.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit c8a41b7d6da7f820754a07cb085687ea5e110f85 Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Wed Feb 18 17:15:39 2009 +0100 repo-add : remove realpath usage Rework slightly db_write_entry so that $pkgfile is no longer referenced from the temporary dir. This means $pkgfile can be a relative path and does not need to be converted with realpath anymore. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit c590ac0997b5c82ddf9115191e9ac5c79efde227 Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Wed Feb 18 16:39:31 2009 +0100 repo-add : remove the need of realpath for REPO_DB_FILE REPO_DB_FILE does not need to be an absolute path anymore so no need to call realpath. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/alpm.h | 3 +- lib/libalpm/deps.c | 36 ++++++++++++++----- lib/libalpm/deps.h | 2 +- lib/libalpm/sync.c | 28 +++++++++++---- pactest/tests/ignore001.py | 17 +++++++++ pactest/tests/ignore002.py | 35 +++++++++++++++++++ pactest/tests/ignore003.py | 35 +++++++++++++++++++ pactest/tests/ignore004.py | 46 +++++++++++++++++++++++++ pactest/tests/ignore005.py | 46 +++++++++++++++++++++++++ pactest/tests/provision020.py | 2 +- pactest/tests/provision022.py | 2 +- pactest/tests/sync1008.py | 2 +- pactest/tests/sync300.py | 2 +- pactest/util.py | 6 ++-- scripts/makepkg.sh.in | 2 - scripts/repo-add.sh.in | 76 +++++++++++++++++++---------------------- src/pacman/callback.c | 27 ++++++++++----- 17 files changed, 289 insertions(+), 78 deletions(-) create mode 100644 pactest/tests/ignore001.py create mode 100644 pactest/tests/ignore002.py create mode 100644 pactest/tests/ignore003.py create mode 100644 pactest/tests/ignore004.py create mode 100644 pactest/tests/ignore005.py hooks/post-receive -- The official pacman repository

3 3

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.2.2-9-ga309a01
by dan＠archlinux.org 24 Feb '09

24 Feb '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 a309a016bfed9f67452f2a6556fb4391fd55b34e (commit) from e7daa59f845f073511c632a972215d047f292f25 (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: scripts/makepkg.sh.in | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] Add pkggrp variable for split packages?
by Allan McRae 24 Feb '09

24 Feb '09

Hi all, One of the things that needs fixed in the splitpkg work is the printing of informational messages. I.e. when printing anything to do with $pkgname. Think of the following messages. - "is not available for the ? architecture" - "Making package" - "Finished making" At the moment ${pkgname[0]} is printed, but that may not be good. The same thing occurs with "makepkg --source" and the naming of the source tarball. I propose fixing this by adding a "pkggrp" field that is only valid with split packages and will hold a name to be used when describing a group of packages. If not specified, it will fall back to pkgname[0]. Does this sound reasonable to people? Allan

4 4

[pacman-dev] [PATCH 1/1] makepkg: fix updating pkgrel with pkgver in SCM packages
by Allan McRae 23 Feb '09

23 Feb '09

Commit 1e656c0a introduced the changing of pkgrel to 1 when the pkgver was updated in SCM PKGBUILDs. However, the output in the "Making package:" was wrong. Attempting to fix that created another bug (FS#13416). Interestingly, pkgver was only ever being updated in the fakeroot stage which caused this problem. Now both pkgver and pkgrel are updated after the first devel_check and devel_update. Enjoy the really long explaination for a two line fix... Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index e10c345..52e80d1 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1176,8 +1176,6 @@ devel_check() { if [ -n "$newpkgver" ]; then msg2 "$(gettext "Version found: %s")" "$newpkgver" - pkgver=$newpkgver - pkgrel=1 fi else -- 1.6.1.3

1 0

[pacman-dev] Pacman Disk Space Issues
by Matthew Wood 20 Feb '09

20 Feb '09

Good Evening- In following the posting at: http://bbs.archlinux.org/viewtopic.php?pid=502174#p502174. I was wondering what the status of the disk space issue was and if I could assist in working out a disk space checking function to incorporate into it. According to the afformentioned post, there is some contention as to where the problem lies. Additionally, I would like to be sure I am following the right procedure for submitting changes, as I have not previously done any work for the community, so please forgive any procedural mistakes or dumb questions, thanks. Matt

4 4

[pacman-dev] [translation] kazakh translation for pacman and libalpm
by Hugo Doria 19 Feb '09

19 Feb '09

kazakh translation for pacman and libalpm. Sent from Baurzhan Muftakhidinov. -- Hugo

1 0

[pacman-dev] Code style (was: [PATCH 2/3] Enabled a new prompt...)
by Dan McGee 19 Feb '09

19 Feb '09

On Wed, Feb 18, 2009 at 9:45 PM, Bryan Ischo <bji-keyword-pacman.3644cb(a)www.ischo.com> wrote: > Dan McGee wrote: >> You can wrap this if you want, ignore my earlier weird recommendations. >> > > Are you talking about the line length issues you pointed out before? And > are you saying here that it's OK to wrap the lines to fit 80 columns in my > editor, rather than trying to match another environment? > > I think that's what you're saying. I will henceforth wrap wherever makes > the most sense for me. You hadn't commented on my comments before, but I > think you agree that the pacman code style guidelines unfortunately cause > problems like these. Using tabs for indentation only works for unbroken > lines; as soon as a line is broken and the second half needs to be lined up > on a non-tab-boundary (with function arguments on the second line lining up > with those on the first, for example), Here is the false statement. Lining things up makes for a hellish experience, and never seems to work right, and only encourages the spaces vs. tabs debate. Just let the editor do the hard work for you- I don't want it to line up at all. Two additional tabs is the standard going rate in our codebase, as this is what vim does by default anyways. The only way lining them up makes sense is if your function name is super short- as soon as your function name and return type are more than 30 characters, you are just needlessly cramming everything over to the right. > then it all goes to pot, since the > number of tabs/spaces needed to make these broken lines line up properly is > entirely dependent on your tab width. Exactly why I'm proposing we do this *not* based on tab width at all. Two extra tabs, always, end of story. > The same problem is true for breaking lines to avoid going over 80 columns; > where 80 columns is for a given line depends on your tab width when you use > tab indenting. I use width 4 tab stops, which I think is just about as > "standard" as you can get with tab widths, but if you're using width 2 tab > stops, then you can fit quite a bit more on deeply nested lines than I can. We probably should be using 4-wide tab stops, but as you can see in the files, the modeline currently sets it to 2. If we were to change this we would have an awful lot of ugly code staring at us, and I'm not quite ready to take that plunge yet. -Dan

3 2

[pacman-dev] [PATCH 2/4] repo-add : remove useless test_repo_db_file function
by Xavier Chantry 19 Feb '09

19 Feb '09

This function was used only once, was basically just one line, and was also called with an unused argument. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> --- scripts/repo-add.sh.in | 11 +---------- 1 files changed, 1 insertions(+), 10 deletions(-) diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index c89e2a5..6b10527 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -82,15 +82,6 @@ This is free software; see the source for copying conditions.\n\ There is NO WARRANTY, to the extent permitted by law.\n")" } -# test if a file is a repository DB -test_repo_db_file () { - if bsdtar -tf "$REPO_DB_FILE" | grep -q "/desc"; then - return 0 # YES - else - return 1 # NO - fi -} - # write a list entry # arg1 - Entry name # arg2 - List @@ -328,7 +319,7 @@ for arg in "$@"; do # store absolute path to repo DB REPO_DB_FILE=$($realpath "$arg") if [ -f "$REPO_DB_FILE" ]; then - if ! test_repo_db_file $cmd; then + if ! (bsdtar -tf "$REPO_DB_FILE" | grep -q "/desc"); then error "$(gettext "Repository file '%s' is not a proper pacman database.")" "$REPO_DB_FILE" exit 1 fi -- 1.6.1.3

3 6

[pacman-dev] [PATCH] contrib/pacdiff : big rework and cleanup
by Xavier Chantry 19 Feb '09

19 Feb '09

I initially only wanted to add a -l/--locate option to use locate instead of find, which should have been easy. Then I thought I would try to support filename with whitespaces while I was at it, and this was a bit more complex. Then I asked for some help on #bash, and I received a lot of criticism on the script :) I tried to address them all, so hopefully that script is in a better state now. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> --- contrib/pacdiff | 64 +++++++++++++++++++++++++++++++++--------------------- 1 files changed, 39 insertions(+), 25 deletions(-) diff --git a/contrib/pacdiff b/contrib/pacdiff index 6493649..f9c29fb 100755 --- a/contrib/pacdiff +++ b/contrib/pacdiff @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # pacdiff : a simple pacnew/pacorig/pacsave updater for /etc/ # # Copyright (c) 2007 Aaron Griffin <aaronmgriffin(a)gmail.com> @@ -17,29 +17,43 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # -# Original http://phraktured.net/config/bin/pacdiff - diffprog=${DIFFPROG:-vimdiff} -for x in $(find /etc/ -name "*.pacnew" -o -name "*.pacorig" -o -name "*.pacsave") -do - echo "File: ${x%.pac*}" - chk="$(cmp $x ${x%.pac*})" - if [ -z "${chk}" ]; then - echo " Files are identical, removing..." - rm $x - else - echo -n " File differences found. (V)iew, (S)kip, (R)emove: [v/s/r] " - read c - c="$(echo $c| tr A-Z a-z)" #tolower - if [ "$c" = "r" ]; then - rm $x - elif [ "$c" = "s" ]; then - continue - else - [ "$c" = "n" -o "$c" = "N" ] || $diffprog $x ${x%.pac*} - echo -n " Remove file? [Y/n] " - read c - [ "$c" = "n" -o "$c" = "N" ] || rm $x - fi - fi + +case $1 in + -l|--locate) + cmd() { locate -0 -e -b \*.pacnew \*.pacorig \*.pacsave; } + ;; + *) + cmd() { find /etc/ -name \*.pacnew -o -name \*.pacorig -o -name \*.pacsave -print0; } + ;; +esac + +exec 3< <(cmd) +while IFS= read -r -d '' pacfile <&3; do + file="${pacfile%.pac*}" + echo "File: $file" + if [ ! -f "$file" ]; then + echo " $file does not exist" + rm -i "$pacfile" + continue + fi + check="$(cmp "$pacfile" "$file")" + if [ -z "${check}" ]; then + echo " Files are identical, removing..." + rm "$pacfile" + else + echo -n " File differences found. (V)iew, (S)kip, (R)emove: [v/s/r] " + while read c; do + case $c in + r|R) rm "$pacfile"; break ;; + v|V) + $diffprog "$pacfile" "$file" + rm -i "$pacfile"; break ;; + s|S) break ;; + *) echo -n " Invalid answer. Try again: [v/s/r] "; continue ;; + esac + done + fi done +exec 3>&- +exit 0 -- 1.6.1.3

4 8

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.2.2-8-ge7daa59
by dan＠archlinux.org 19 Feb '09

19 Feb '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 e7daa59f845f073511c632a972215d047f292f25 (commit) via 48b209d6121f24e990951daf0edf1345012b4c78 (commit) via eb1775e485f7320142a3c66332166ff5ab1f0401 (commit) from ea84819bbbdba90f950339790d482f2348c2e9ef (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: doc/PKGBUILD.5.txt | 10 +++++----- po/pl.po | 2 +- scripts/repo-add.sh.in | 29 ++++++++++++++++------------- 3 files changed, 22 insertions(+), 19 deletions(-) hooks/post-receive -- The official pacman repository

1 0

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

19 Feb '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 1c4633ea2cbc01cfd7929509724951615827c482 (commit) via 6c4d702cb10f9bc5da23b6511f09f4b4a07a4281 (commit) via e7daa59f845f073511c632a972215d047f292f25 (commit) via e515d89969ac7f8448a419b373530376ffe436bf (commit) via dce7aa85696680035a512dde7daf89f9506f8523 (commit) via 48b209d6121f24e990951daf0edf1345012b4c78 (commit) via 14c1a4423e62d9026e8025b79e6902c06ea4ae47 (commit) via eb1775e485f7320142a3c66332166ff5ab1f0401 (commit) from 04c2b9d4edb7f7e592919fa3bb975f9edd4fa0a6 (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 1c4633ea2cbc01cfd7929509724951615827c482 Merge: 6c4d702cb10f9bc5da23b6511f09f4b4a07a4281 e7daa59f845f073511c632a972215d047f292f25 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Feb 18 21:20:17 2009 -0600 Merge branch 'maint' commit 6c4d702cb10f9bc5da23b6511f09f4b4a07a4281 Author: Bryan Ischo <bryan(a)ischo.com> Date: Tue Jan 27 01:48:39 2009 +1300 Reorganize code for one-at-a-time resolving This change reorganizes the internal code so that packages are resolved one at a time instead of all at once from a list. This will allow a future checkin to prompt the user to see if they'd rather remove unresolvable packages from the transaction and continue, or fail the transaction. This change does not affect the actual behavior of libalpm and all tests pass without changes. Signed-off-by: Bryan Ischo <bryan(a)ischo.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit e515d89969ac7f8448a419b373530376ffe436bf Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Wed Feb 18 15:35:00 2009 +0100 repo-add : remove useless test_repo_db_file function This function was used only once, was basically just one line, and was also called with an unused argument. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit dce7aa85696680035a512dde7daf89f9506f8523 Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Tue Feb 17 23:40:11 2009 +0100 contrib/pacdiff : rework and cleanup I initially only wanted to add a -l/--locate option to use locate instead of find, which should have been easy. Then I thought I would try to support filename with whitespace while I was at it, and this was a bit more complex. The safest ways seem to be the following ones : http://mywiki.wooledge.org/BashFAQ/020 Then I received a lot of suggestions on #bash about how to improve the script, which I tried to address. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> [Dan: fix grouping of find arguments] Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 14c1a4423e62d9026e8025b79e6902c06ea4ae47 Author: Kevin Barry <barryk(a)gmail.com> Date: Sun Feb 15 19:47:45 2009 -0500 configure.ac: use full path of stat for Mac OS X Change configure.ac to use the full path of stat when on darwin/mac. This is needed for situations when a user installs the GNU/coreutils and places it in their path before /usr/bin, but the SIZECMD is already configured for Darwin's version of stat. Signed-off-by: Kevin Barry <barryk gmail com> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: configure.ac | 2 +- contrib/pacdiff | 85 ++++++++++++++++++++++++++++++++--------------- doc/PKGBUILD.5.txt | 10 +++--- lib/libalpm/deps.c | 50 ++++++++++++++++++++++------ lib/libalpm/deps.h | 4 +- lib/libalpm/sync.c | 47 ++++++++++++++++++++------ po/pl.po | 2 +- scripts/repo-add.sh.in | 40 +++++++++------------- 8 files changed, 160 insertions(+), 80 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH 1/3] Internal code reorganization in preparation for changes to package
by Bryan Ischo 19 Feb '09

19 Feb '09

From: Bryan Ischo <bryan(a)ischo.com> This change reorganizes the internal code so that packages are resolved one at a time instead of all at once from a list. This will allow a future checkin to prompt the user to see if they'd rather remove unresolvable packages from the tranasaction and continue, or fail the transaction. This change does not affect the actual behavior of libalpm and all tests pass without changes. Signed-off-by: Bryan Ischo <bryan(a)ischo.com> --- lib/libalpm/deps.c | 52 +++++++++++++++++++++++++++++++++++++++++----------- lib/libalpm/deps.h | 4 ++-- lib/libalpm/sync.c | 47 ++++++++++++++++++++++++++++++++++++----------- 3 files changed, 79 insertions(+), 24 deletions(-) diff --git a/lib/libalpm/deps.c b/lib/libalpm/deps.c index 940f12c..da21087 100644 --- a/lib/libalpm/deps.c +++ b/lib/libalpm/deps.c @@ -546,17 +546,33 @@ pmpkg_t *_alpm_resolvedep(pmdepend_t *dep, alpm_list_t *dbs, alpm_list_t *exclud return(NULL); } -/* populates list with packages that need to be installed to satisfy all - * dependencies of packages in list - * - * @param remove contains packages elected for removal +/* Computes resolvable dependencies for a given package and adds that package + * and those resolvable dependencies to a list. + * + * @param local is the local database + * @param dbs_sync are the sync databases + * @param pkg is the package to resolve + * @param packages is a pointer to a list of packages which will be + * searched first for any dependency packages needed to complete the + * resolve, and to which will be added any [pkg] and all of its + * dependencies not already on the list + * @param remove is the set of packages which will be removed in this + * transaction + * @param data returns the dependency which could not be satisfied in the + * event of an error + * @return 0 on success, with [pkg] and all of its dependencies not already on + * the [*packages] list added to that list, or -1 on failure due to an + * unresolvable dependency, in which case the [*packages] list will be + * unmodified by this function */ -int _alpm_resolvedeps(pmdb_t *local, alpm_list_t *dbs_sync, alpm_list_t *list, - alpm_list_t *remove, alpm_list_t **data) +int _alpm_resolvedeps(pmdb_t *local, alpm_list_t *dbs_sync, pmpkg_t *pkg, + alpm_list_t **packages, alpm_list_t *remove, + alpm_list_t **data) { alpm_list_t *i, *j; alpm_list_t *targ; alpm_list_t *deps = NULL; + alpm_list_t *packages_copy; ALPM_LOG_FUNC; @@ -564,8 +580,19 @@ int _alpm_resolvedeps(pmdb_t *local, alpm_list_t *dbs_sync, alpm_list_t *list, return(-1); } + if(_alpm_pkg_find(*packages, pkg->name) != NULL) { + return(0); + } + + /* Create a copy of the packages list, so that it can be restored + on error */ + packages_copy = alpm_list_copy(*packages); + /* [pkg] has not already been resolved into the packages list, so put it + on that list */ + *packages = alpm_list_add(*packages, pkg); + _alpm_log(PM_LOG_DEBUG, "started resolving dependencies\n"); - for(i = list; i; i = i->next) { + for(i = alpm_list_last(*packages); i; i = i->next) { pmpkg_t *tpkg = i->data; targ = alpm_list_add(NULL, tpkg); deps = alpm_checkdeps(_alpm_db_get_pkgcache(local), 0, remove, targ); @@ -573,12 +600,12 @@ int _alpm_resolvedeps(pmdb_t *local, alpm_list_t *dbs_sync, alpm_list_t *list, for(j = deps; j; j = j->next) { pmdepmissing_t *miss = j->data; pmdepend_t *missdep = alpm_miss_get_dep(miss); - /* check if one of the packages in list already satisfies this dependency */ - if(_alpm_find_dep_satisfier(list, missdep)) { + /* check if one of the packages in the [*packages] list already satisfies this dependency */ + if(_alpm_find_dep_satisfier(*packages, missdep)) { continue; } /* find a satisfier package in the given repositories */ - pmpkg_t *spkg = _alpm_resolvedep(missdep, dbs_sync, list, tpkg); + pmpkg_t *spkg = _alpm_resolvedep(missdep, dbs_sync, *packages, tpkg); if(!spkg) { pm_errno = PM_ERR_UNSATISFIED_DEPS; char *missdepstring = alpm_dep_compute_string(missdep); @@ -592,18 +619,21 @@ int _alpm_resolvedeps(pmdb_t *local, alpm_list_t *dbs_sync, alpm_list_t *list, *data = alpm_list_add(*data, missd); } } + alpm_list_free(*packages); + *packages = packages_copy; alpm_list_free_inner(deps, (alpm_list_fn_free)_alpm_depmiss_free); alpm_list_free(deps); return(-1); } else { _alpm_log(PM_LOG_DEBUG, "pulling dependency %s (needed by %s)\n", alpm_pkg_get_name(spkg), alpm_pkg_get_name(tpkg)); - list = alpm_list_add(list, spkg); + *packages = alpm_list_add(*packages, spkg); } } alpm_list_free_inner(deps, (alpm_list_fn_free)_alpm_depmiss_free); alpm_list_free(deps); } + alpm_list_free(packages_copy); _alpm_log(PM_LOG_DEBUG, "finished resolving dependencies\n"); return(0); } diff --git a/lib/libalpm/deps.h b/lib/libalpm/deps.h index 2f3c450..0727095 100644 --- a/lib/libalpm/deps.h +++ b/lib/libalpm/deps.h @@ -48,8 +48,8 @@ void _alpm_depmiss_free(pmdepmissing_t *miss); alpm_list_t *_alpm_sortbydeps(alpm_list_t *targets, int reverse); void _alpm_recursedeps(pmdb_t *db, alpm_list_t *targs, int include_explicit); pmpkg_t *_alpm_resolvedep(pmdepend_t *dep, alpm_list_t *dbs, alpm_list_t *excluding, pmpkg_t *tpkg); -int _alpm_resolvedeps(pmdb_t *local, alpm_list_t *dbs_sync, alpm_list_t *list, - alpm_list_t *remove, alpm_list_t **data); +int _alpm_resolvedeps(pmdb_t *local, alpm_list_t *dbs_sync, pmpkg_t *pkg, + alpm_list_t **packages, alpm_list_t *remove, alpm_list_t **data); int _alpm_dep_edge(pmpkg_t *pkg1, pmpkg_t *pkg2); pmdepend_t *_alpm_splitdep(const char *depstring); pmpkg_t *_alpm_find_dep_satisfier(alpm_list_t *pkgs, pmdepend_t *dep); diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index b458874..5e5ca92 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -399,6 +399,7 @@ int _alpm_sync_prepare(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync { alpm_list_t *deps = NULL; alpm_list_t *list = NULL, *remove = NULL; /* allow checkdeps usage with trans->packages */ + alpm_list_t *unresolvable = NULL; alpm_list_t *i, *j; int ret = 0; @@ -411,15 +412,13 @@ int _alpm_sync_prepare(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync *data = NULL; } - for(i = trans->packages; i; i = i->next) { - pmsyncpkg_t *sync = i->data; - list = alpm_list_add(list, sync->pkg); - } - - if(!(trans->flags & PM_TRANS_FLAG_NODEPS)) { - /* store a pointer to the last original target so we can tell what was - * pulled by resolvedeps */ - alpm_list_t *pulled = alpm_list_last(list); + if(trans->flags & PM_TRANS_FLAG_NODEPS) { + for(i = trans->packages; i; i = i->next) { + pmsyncpkg_t *sync = i->data; + list = alpm_list_add(list, sync->pkg); + } + } else { + /* Build up list by repeatedly resolving each transaction package */ /* Resolve targets dependencies */ EVENT(trans, PM_TRANS_EVT_RESOLVEDEPS_START, NULL, NULL); _alpm_log(PM_LOG_DEBUG, "resolving target's dependencies\n"); @@ -432,14 +431,39 @@ int _alpm_sync_prepare(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync } } - if(_alpm_resolvedeps(db_local, dbs_sync, list, remove, data) == -1) { + /* Resolve packages in the transaction one at a time, in addtion + building up a list of packages which could not be resolved. */ + for(i = trans->packages; i; i = i->next) { + pmpkg_t *pkg = ((pmsyncpkg_t *) i->data)->pkg; + if(_alpm_resolvedeps(db_local, dbs_sync, pkg, &list, remove, data) == -1) { + unresolvable = alpm_list_add(unresolvable, pkg); + } + /* Else, [list] now additionally contains [pkg] and all of its + dependencies not already on the list */ + } + + /* If there were unresolvable top-level packages, fail the + transaction. */ + if(unresolvable != NULL) { /* pm_errno is set by resolvedeps */ ret = -1; goto cleanup; } - for(i = pulled->next; i; i = i->next) { + /* Add all packages which were "pulled" (i.e. weren't already in the + transaction) to the transaction in pmsyncpkg_t structures */ + for(i = list; i; i = i->next) { pmpkg_t *spkg = i->data; + for(j = trans->packages; j; j = j->next) { + if(_alpm_pkg_cmp(spkg, ((pmsyncpkg_t *) j->data)->pkg) == 0) { + spkg = NULL; + break; + } + } + if (spkg == NULL) { + continue; + } + pmsyncpkg_t *sync = _alpm_sync_new(PM_PKG_REASON_DEPEND, spkg, NULL); if(sync == NULL) { ret = -1; @@ -627,6 +651,7 @@ int _alpm_sync_prepare(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync cleanup: alpm_list_free(list); alpm_list_free(remove); + alpm_list_free(unresolvable); return(ret); } -- 1.6.1

2 9

[pacman-dev] [PATCH] A tiny fix in the Polish translation.
by Jan Stępień 19 Feb '09

19 Feb '09

From: Jan Stępień <jstepien(a)users.sourceforge.net> The previous translation of 'targets' meant literally 'it targets' and it sounded awkwardly. The current version is a plural of a 'target'. Signed-off-by: Jan Stępień <jstepien(a)users.sourceforge.net> --- po/pl.po | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/po/pl.po b/po/pl.po index eaafb3b..cf027ac 100644 --- a/po/pl.po +++ b/po/pl.po @@ -900,7 +900,7 @@ msgstr "Żadnych" #, c-format msgid "Targets (%d):" -msgstr "Celuje (%d):" +msgstr "Cele (%d):" #, c-format msgid "Total Download Size: %.2f MB\n" -- 1.6.1.3

2 1

[pacman-dev] about pacdiff
by Xavier 17 Feb '09

17 Feb '09

I like a lot pacdiff for dealing with pacnew files. I always notice that it miss the grub config because it lies in /boot/ while pacdiff only checks in /etc/ I was curious so I decided to have a look at how many backup config files are not in /etc/ :) $ sh backup.sh > backup-list $ cat backup-list | cut -d'/' -f1 | sort -u boot conf.d home opt srv sysctl.conf usr var Note that we have three crazy files there : empty, conf.d and sysctl.conf. Here are the three problematic files/packages : conf.d/ntp-client.conf / /var/abs/extra/ntp/PKGBUILD /etc/foomatic/filter.conf / /var/abs/testing/foomatic-filters/PKGBUILD sysctl.conf / /var/abs/community/network/ufw/PKGBUILD I should probably report bugs for these, though it was not my original intention. So after this manual filtering, here is the list : boot home opt srv usr var That would considerably slow down pacdiff though so probably not worth it. It is disappointing :)

4 5

[pacman-dev] Fwd: [PATCH] repo-add: fix eval and quote issues
by Dan McGee 16 Feb '09

16 Feb '09

Yes, I think I sent this to myself on accident. Looks like it is time for another cup of coffee. ---------- Forwarded message ---------- From: Dan McGee <dan(a)archlinux.org> Date: Sun, Feb 8, 2009 at 12:30 PM Subject: Re: [PATCH] repo-add: fix eval and quote issues To: Dan McGee <dan(a)archlinux.org> On Sun, Feb 8, 2009 at 12:22 PM, Dan McGee <dan(a)archlinux.org> wrote: > eval was ugly and dirty, and bit us here. Instead, use a safer form of > variable declaration to ensure quotes don't foil us in pkgdesc or any other > fields. > > This fixes FS#10837. > > Signed-off-by: Dan McGee <dan(a)archlinux.org> > --- We apparently had never handled quotes in descriptions correctly, so this patch should fix these issues. I'm going to push this patch to maint if there are no objections, although I expect our next release will come from master. > scripts/repo-add.sh.in | 25 +++++++++++++------------ > 1 files changed, 13 insertions(+), 12 deletions(-) > > diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in > index be0859e..93fdd52 100644 > --- a/scripts/repo-add.sh.in > +++ b/scripts/repo-add.sh.in > @@ -152,18 +152,19 @@ db_write_entry() > > # read info from the zipped package > local line I did make one small fix here- added var and val to the local declaration. > - for line in $(bsdtar -xOf "$pkgfile" .PKGINFO | \ > - grep -v "^#" | sed 's|$\w*$\s*=\s*$.*$|\1="\2"|'); do > - eval "$line" > - case "$line" in > - group=*) _groups="$_groups$group\n" ;; > - depend=*) _depends="$_depends$depend\n" ;; > - backup=*) _backups="$_backups$backup\n" ;; > - license=*) _licenses="$_licenses$license\n" ;; > - replaces=*) _replaces="$_replaces$replaces\n" ;; > - provides=*) _provides="$_provides$provides\n" ;; > - conflict=*) _conflicts="$_conflicts$conflict\n" ;; > - optdepend=*) _optdepends="$_optdepends$optdepend\n" ;; > + for line in $(bsdtar -xOf "$pkgfile" .PKGINFO | grep -v '^#'); do > + var="$(echo $line | sed 's|$\w*$\s*=\s*$.*$|\1|')" > + val="$(echo $line | sed 's|$\w*$\s*=\s*$.*$|\2|')" > + declare $var="$val" > + case "$var" in > + group) _groups="$_groups$group\n" ;; > + depend) _depends="$_depends$depend\n" ;; > + backup) _backups="$_backups$backup\n" ;; > + license) _licenses="$_licenses$license\n" ;; > + replaces) _replaces="$_replaces$replaces\n" ;; > + provides) _provides="$_provides$provides\n" ;; > + conflict) _conflicts="$_conflicts$conflict\n" ;; > + optdepend) _optdepends="$_optdepends$optdepend\n" ;; > esac > done > > -- > 1.6.1.2

7 12

[pacman-dev] [PATCH] Mac OS X Full path of sed
by Kevin Barry 16 Feb '09

16 Feb '09

> Please resend both of these patches as separate emails- git tools are > meant to have one patch per email, whether using format-patch or am. Sure thing. I'm new to git. Change configure.ac to use the full path of stat when on darwin/mac. This is needed for situations when a user installs the GNU/coreutils and places it in their path before /usr/bin, but the SIZECMD is already configured for Darwin's version of stat. Signed-off-by: Kevin Barry <barryk gmail com> --- configure.ac | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/configure.ac b/configure.ac index 2e7f433..216cf76 100644 --- a/configure.ac +++ b/configure.ac @@ -190,7 +190,7 @@ case "${host_os}" in ;; darwin*) host_os_darwin=yes - SIZECMD="stat -f %z" + SIZECMD="/usr/bin/stat -f %z" ;; esac -- 1.6.1.2

3 2

[pacman-dev] [PATCH] repo-add: bash implementation of realpath
by Yun Zheng Hu 16 Feb '09

16 Feb '09

Replaced readlink -f / realpath with a more portable bash implementation. Signed-off-by: Yun Zheng Hu <yunzheng.hu(a)gmail.com> --- scripts/repo-add.sh.in | 37 ++++++++++++++++++++++++------------- 1 files changed, 24 insertions(+), 13 deletions(-) diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index c89e2a5..f266719 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -107,7 +107,7 @@ write_list_entry() { db_write_delta() { # blank out all variables and set deltafile to absolute path - local deltafile=$($realpath "$1") + local deltafile=$(realpath "$1") local filename=$(basename "$deltafile") local deltavars pkgname fromver tover arch csize md5sum @@ -138,7 +138,7 @@ db_write_delta() db_write_entry() { # blank out all variables and set pkgfile to an absolute path - local pkgfile=$($realpath "$1") + local pkgfile=$(realpath "$1") local pkgname pkgver pkgdesc url builddate packager csize size \ group depend backup license replaces provides conflict force \ _groups _depends _backups _licenses _replaces _provides _conflicts \ @@ -267,6 +267,27 @@ db_remove_entry() { popd 2>&1 >/dev/null } # end db_remove_entry +# bash implementation of realpath / readlink -f +# arg1 - filename +realpath() +{ + fname=${1%/} # strips trailing '/' + while [ -L "$fname" ]; do + oldfname="$fname" + fname="$(command ls -l $fname)" + fname="${fname#*\> }" + if [ "$fname" = . ] ; then + fname="$(dirname $oldfname)" + elif echo $fname | grep -vq '^/' - ; then + fname="$(dirname $oldfname)/$fname" + fi + done + pushd $(dirname $fname) > /dev/null + fname=$(pwd -P)/$(basename $fname) + popd > /dev/null + echo $fname +} + # PROGRAM START # determine whether we have gettext; make it a no-op if we do not @@ -294,16 +315,6 @@ if [ $# -lt 2 ]; then exit 1 fi -# check for and store the name of a realpath-like program -if [ $(type -t realpath) ]; then - realpath='realpath' -elif [ $(type -t readlink) ]; then - realpath='readlink -f' -else - error "$(gettext "Either realpath or readlink are required by repo-add.")" - exit 1 # $E_MISSING_PROGRAM -fi - # main routine gstmpdir=$(mktemp -d /tmp/repo-tools.XXXXXXXXXX) || (\ error "$(gettext "Cannot create temp directory for database building.")"; \ @@ -326,7 +337,7 @@ for arg in "$@"; do QUIET=1 elif [ -z "$REPO_DB_FILE" ]; then # store absolute path to repo DB - REPO_DB_FILE=$($realpath "$arg") + REPO_DB_FILE=$(realpath "$arg") if [ -f "$REPO_DB_FILE" ]; then if ! test_repo_db_file $cmd; then error "$(gettext "Repository file '%s' is not a proper pacman database.")" "$REPO_DB_FILE" -- 1.6.1.2

5 6

[pacman-dev] [PATCH] BSD/Mac OS X sed inplace backups with mktemp
by Kevin Barry 16 Feb '09

16 Feb '09

This patch changes the way that sed inplace is run in makepkg when running in versionpkg mode. Previous, sed would run with no backup file, called in the GNU way. It seems there is no cross platform method of calling sed inplace with no backup (BSD/sed uses sed -i '', GNU/sed uses sed -i'' or simply sed -i). Instead, this patch creates a backup file (from an mktemp extension) and removes it after the successful completetion of the sed operation. This means the user should not see the backup file, unless something went wrong (Full partition for example) in which case they don't lose the previous PKGBUILD as they would in previous versions. Further information about GNU/sed versus BSD/sed: On Mac OS X (Man page is from FreeBSD, so I believe it would be the same there): sed -i -e 's/foo/bar/' filename will create a backup file named filename-e sed -i -e 's/foo/bar/' -e 's/asd/dsa/' filename will give an error message because of the second -e sed -i 's/foo/bar/' filename will give an error message sed -i '' 's/foo/bar/' filename will work without creating a backup, but fails on GNU/sed sed -i'' 's/foo/bar/' filename sed -i 's/foo/bar/' filename Work only on GNU/sed Signed-off-by: Kevin Barry <barryk gmail com> --- scripts/makepkg.sh.in | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index e10c345..5af4add 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1199,8 +1199,13 @@ devel_update() { if [ -n "$newpkgver" ]; then if [ "$newpkgver" != "$pkgver" ]; then if [ -f "./$BUILDSCRIPT" ]; then - sed -i "s/^pkgver=[^ ]*/pkgver=$newpkgver/" "./$BUILDSCRIPT" - sed -i "s/^pkgrel=[^ ]*/pkgrel=1/" "./$BUILDSCRIPT" + # Create temporary filename for sed backup. + # Needed for BSD/GNU cross-platform compatibility + TEMP_NAME=$(mktemp -u "./${BUILDSCRIPT}.XXXXXX") + TEMP_NAME=${TEMP_NAME#"./${BUILDSCRIPT}."} + sed -i".${TEMP_NAME}" -e "s/^pkgver=[^ ]*/pkgver=$newpkgver/" \ + -e "s/^pkgrel=[^ ]*/pkgrel=1/" "./$BUILDSCRIPT" && + rm -f "./${BUILDSCRIPT}.${TEMP_NAME}" source "$BUILDSCRIPT" fi fi -- 1.6.1.2

1 0

[pacman-dev] [PATCH] BSD/Mac OS X sed inplace backups
by Kevin Barry 16 Feb '09

16 Feb '09

> What does BSD sed currently do? I am assuming it leaves a backup file(s) but can you clarify the numbers and names of these? On Mac OS X (Man page is from FreeBSD, so I believe it would be the same there): sed -i -e 's/foo/bar/' filename will create a backup file named filename-e sed -i -e 's/foo/bar' -e '/asd/dsa/' filename will give an error message because sed -i 's/foo/bar' filename will give an error message sed -i '' 's/foo/bar/' filename will work without creating a backup file, but fails on GNU/sed It's really annoying that BSD sed doesn't like sed -i'' and GNU/sed doesn't like sed -i '' This patch changes the way that sed inplace is run in makepkg when running in versionpkg mode. Previous, sed would run with no backup file, called in the GNU way. It seems there is no cross platform method of calling sed inplace with no backup (BSD/sed uses sed -i '', GNU/sed uses sed -i'' or simply sed -i). Instead, this patch creates a backup file (.pkgsave) and removes it after the succesful completion of the sed operation. This means the user should not see the backup file, unless something went run (full hard drive?) in which case they don't lose the PKGBUILD as they would have before. Signed-off-by: Kevin Barry <barryk gmail com> --- scripts/makepkg.sh.in | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index e10c345..8ddf88f 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1199,8 +1199,9 @@ devel_update() { if [ -n "$newpkgver" ]; then if [ "$newpkgver" != "$pkgver" ]; then if [ -f "./$BUILDSCRIPT" ]; then - sed -i "s/^pkgver=[^ ]*/pkgver=$newpkgver/" "./$BUILDSCRIPT" - sed -i "s/^pkgrel=[^ ]*/pkgrel=1/" "./$BUILDSCRIPT" + sed -i.pkgsave -e "s/^pkgver=[^ ]*/pkgver=$newpkgver/" \ + -e "s/^pkgrel=[^ ]*/pkgrel=1/" "./$BUILDSCRIPT" && + rm -f "./${BUILDSCRIPT}.pkgsave" source "$BUILDSCRIPT" fi fi -- 1.6.1.2

3 2

[pacman-dev] [PATCH] Mac OS X [1] Full path of stat (SIZECMD) and [2] sed -i
by Kevin Barry 15 Feb '09

15 Feb '09

Change configure.ac to use the full path of stat when on darwin/mac. This is needed for situations when a user installs the GNU/coreutils and places it in their path before /usr/bin, but the SIZECMD is already configured for Darwin's version of stat. Signed-off-by: Kevin Barry <barryk gmail com> --- configure.ac | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/configure.ac b/configure.ac index 2e7f433..216cf76 100644 --- a/configure.ac +++ b/configure.ac @@ -190,7 +190,7 @@ case "${host_os}" in ;; darwin*) host_os_darwin=yes - SIZECMD="stat -f %z" + SIZECMD="/usr/bin/stat -f %z" ;; esac -- 1.6.1.2 Patch Number Two This patch changes the way that sed inplace is run in makepkg when running in versionpkg mode. Previous, sed would run with no backup file, called in the GNU way. It seems there is no cross platform method of calling sed inplace with no backup (BSD/sed uses sed -i '', GNU/sed uses sed -i'' or simply sed -i). Instead, this patch creates a backup file (.pkgsave) and removes it after the succesful completion of the sed operation. This means the user should not see the backup file, unless something went run (full hard drive?) in which case they don't lose the PKGBUILD as they would have before. Signed-off-by: Kevin Barry <barryk gmail com> --- scripts/makepkg.sh.in | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index e10c345..8ddf88f 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1199,8 +1199,9 @@ devel_update() { if [ -n "$newpkgver" ]; then if [ "$newpkgver" != "$pkgver" ]; then if [ -f "./$BUILDSCRIPT" ]; then - sed -i "s/^pkgver=[^ ]*/pkgver=$newpkgver/" "./$BUILDSCRIPT" - sed -i "s/^pkgrel=[^ ]*/pkgrel=1/" "./$BUILDSCRIPT" + sed -i.pkgsave -e "s/^pkgver=[^ ]*/pkgver=$newpkgver/" \ + -e "s/^pkgrel=[^ ]*/pkgrel=1/" "./$BUILDSCRIPT" && + rm -f "./${BUILDSCRIPT}.pkgsave" source "$BUILDSCRIPT" fi fi -- 1.6.1.2

3 2

[pacman-dev] Non-reentrancy of libalpm, why?
by Patrick Walton 15 Feb '09

15 Feb '09

Hi, I noticed that libalpm isn't reentrant/thread-safe, even though it defines pmhandle_t to store all global information instead of using multiple global variables. This is unfortunate for my use case. I'm thinking about writing a cross-compiling makepkg-like utility, which would need to access two package handles simultaneously at once: that of the host and that of the target. Is there a reason why libalpm isn't reentrant? And how frozen is the libalpm API supposed to be? Thanks, Patrick

2 1

[pacman-dev] PLEASE take my patches. PLEASE.
by Bryan Ischo 15 Feb '09

15 Feb '09

I hate to be reduced to begging, but after weeks of no one taking my patches, this is what I have to do. I jumped through every hoop I was asked to jump through to get my patches accepted (and to be honest, there were ALOT of hoops). My most recent patches apply to the source code without any conflicts and address all outstanding issues raised on this list. Dan McGee said that if I addressed those issues, he'd take my patches. Well I did, weeks ago, and yet, my patches are not in the tree. So this is one last attempt on my part to try to get a pacman dev to apply my patches to the master git tree. It should be trivially easy - should take all of a few seconds. Thanks, Bryan

3 3

[pacman-dev] HTML email will be rejected
by Aaron Griffin 13 Feb '09

13 Feb '09

Hello all, I am writing to inform you that I have changed all the Arch lists to reject HTML formatted email. Please send messages in plain text only. Note: This is true of all lists, but I am only sending this message to the higher trafficked lists. Cheers, Aaron

1 1

[pacman-dev] [PATCH] repo-add: added a realpath implementation in bash
by Yun Zheng Hu 11 Feb '09

11 Feb '09

When realpath or readlink is not available it will fallback to a realpath implementation in bash. An extra check is also added for "readlink -f", because not all platforms support the -f flag. The readlink implementation in bash is borrowed from Debian's dpkg tools. Signed-off-by: Yun Zheng Hu <yunzheng.hu(a)gmail.com> --- scripts/repo-add.sh.in | 23 ++++++++++++++++++++--- 1 files changed, 20 insertions(+), 3 deletions(-) diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index c89e2a5..ea16731 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -297,11 +297,28 @@ fi # check for and store the name of a realpath-like program if [ $(type -t realpath) ]; then realpath='realpath' -elif [ $(type -t readlink) ]; then +elif [ $(type -t readlink) -a "$(readlink -f . 2>/dev/null)" != "" ]; then realpath='readlink -f' else - error "$(gettext "Either realpath or readlink are required by repo-add.")" - exit 1 # $E_MISSING_PROGRAM + realpath_bash() + { + fname=${1%/} # strips trailing '/' + while [ -L "$fname" ]; do + oldfname="$fname" + fname="$(command ls -l $fname)" + fname="${fname#*\> }" + if [ "$fname" = . ] ; then + fname="$(dirname $oldfname)" + elif echo $fname | grep -vq '^/' - ; then + fname="$(dirname $oldfname)/$fname" + fi + done + pushd $(dirname $fname) > /dev/null + fname=$(pwd -P)/$(basename $fname) + popd > /dev/null + echo $fname + } + realpath=realpath_bash fi # main routine -- 1.6.1.2

5 5

[pacman-dev] [PATCH] Allow vendor based DLAGENT settings in makepkg.conf
by Yun Zheng Hu 08 Feb '09

08 Feb '09

This patch will allow the default DLAGENT settings to be overridden in the configure script. This will allow better default DLAGENT settings for specific platforms/vendors. For example: Mac OS X does not have wget installed by default, but it does have curl by default. Currently the patch only overrides the default FTP and HTTP/HTTPS agents when configuring for Mac OS X. Signed-off-by: Yun Zheng Hu <yunzheng.hu(a)gmail.com> --- configure.ac | 20 ++++++++++++++++++++ etc/Makefile.am | 5 +++++ etc/makepkg.conf.in | 10 +++++----- 3 files changed, 30 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index 2e7f433..0a63405 100644 --- a/configure.ac +++ b/configure.ac @@ -236,6 +236,26 @@ case "${host}" in ;; esac +# Configure DLAGENT settings, used in makepkg.conf +DLAGENT_FTP="ftp::/usr/bin/wget -c --passive-ftp -t 3 --waitretry=3 -O %o %u" +DLAGENT_HTTP="http::/usr/bin/wget -c -t 3 --waitretry=3 -O %o %u" +DLAGENT_HTTPS="https::/usr/bin/wget -c -t 3 --waitretry=3 --no-check-certificate -O %o %u" +DLAGENT_RSYNC="rsync::/usr/bin/rsync -z %u %o" +DLAGENT_SCP="scp::/usr/bin/scp -C %u %o" +case "${host_vendor}" in + apple) + DLAGENT_FTP="ftp::/usr/bin/curl --location --continue-at - --retry 3 --retry-delay 3 -o %o %u" + DLAGENT_HTTP="http::/usr/bin/curl --location --continue-at - --retry 3 --retry-delay 3 -o %o %u" + DLAGENT_HTTPS="https::/usr/bin/curl --location --continue-at - --retry 3 --retry-delay 3 --insecure -o %o %u" + ;; +esac + +AC_SUBST(DLAGENT_FTP) +AC_SUBST(DLAGENT_HTTP) +AC_SUBST(DLAGENT_HTTPS) +AC_SUBST(DLAGENT_RSYNC) +AC_SUBST(DLAGENT_SCP) + # Now do some things common to all architectures CHOST="${host}" AC_SUBST(CARCH) diff --git a/etc/Makefile.am b/etc/Makefile.am index 55c28c3..1605bfc 100644 --- a/etc/Makefile.am +++ b/etc/Makefile.am @@ -15,6 +15,11 @@ edit = sed \ -e 's|@SRCEXT[@]|$(SRCEXT)|g' \ -e 's|@CARCH[@]|$(CARCH)|g' \ -e 's|@CHOST[@]|$(CHOST)|g' \ + -e 's|@DLAGENT_FTP[@]|$(DLAGENT_FTP)|g' \ + -e 's|@DLAGENT_HTTP[@]|$(DLAGENT_HTTP)|g' \ + -e 's|@DLAGENT_HTTPS[@]|$(DLAGENT_HTTPS)|g' \ + -e 's|@DLAGENT_RSYNC[@]|$(DLAGENT_RSYNC)|g' \ + -e 's|@DLAGENT_SCP[@]|$(DLAGENT_SCP)|g' \ -e 's|@ARCHSWITCH[@]|$(ARCHSWITCH)|g' \ -e 's|@CARCHFLAGS[@]|$(CARCHFLAGS)|g' \ -e 's|@ROOTDIR[@]|$(ROOTDIR)|g' diff --git a/etc/makepkg.conf.in b/etc/makepkg.conf.in index d811867..d6c4ea6 100644 --- a/etc/makepkg.conf.in +++ b/etc/makepkg.conf.in @@ -8,11 +8,11 @@ # #-- The download utilities that makepkg should use to acquire sources # Format: 'protocol::agent' -DLAGENTS=('ftp::/usr/bin/wget -c --passive-ftp -t 3 --waitretry=3 -O %o %u' - 'http::/usr/bin/wget -c -t 3 --waitretry=3 -O %o %u' - 'https::/usr/bin/wget -c -t 3 --waitretry=3 --no-check-certificate -O %o %u' - 'rsync::/usr/bin/rsync -z %u %o' - 'scp::/usr/bin/scp -C %u %o') +DLAGENTS=('@DLAGENT_FTP@' + '@DLAGENT_HTTP@' + '@DLAGENT_HTTPS@' + '@DLAGENT_RSYNC@' + '@DLAGENT_SCP@') # Other common tools: # /usr/bin/snarf -- 1.6.1.2

3 2