February 2009 - Pacman-dev - lists.archlinux.org

[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