- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] Fix typo in documentation
by Allan McRae 11 Aug '12

11 Aug '12

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- src/pacman/package.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pacman/package.c b/src/pacman/package.c index fc869b1..77d58e1 100644 --- a/src/pacman/package.c +++ b/src/pacman/package.c @@ -52,7 +52,7 @@ static void deplist_display(const char *title, } /** Turn a optdepends list into a text list. - * @param optdeps a list with items of type alpm_optdepend_t + * @param optdeps a list with items of type alpm_depend_t */ static void optdeplist_display(const char *title, alpm_list_t *optdeps, unsigned short cols) -- 1.7.11.4

1 0

[pacman-dev] [PATCH] makepkg: fix warnings with --noextract
by Allan McRae 11 Aug '12

11 Aug '12

Three warnings after someone deliberately typed --noextract is a tad excessive... Also, an empty $srcdir is perfectly valid when the source array is empty, although using --noextact then is wasteful. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 262bcf8..270f988 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -2699,15 +2699,7 @@ chmod a-s "$srcdir" cd_safe "$srcdir" if (( NOEXTRACT )); then - warning "$(gettext "Skipping source retrieval -- using existing %s tree")" "src/" - warning "$(gettext "Skipping source integrity checks -- using existing %s tree")" "src/" - warning "$(gettext "Skipping source extraction -- using existing %s tree")" "src/" - - if (( NOEXTRACT )) && dir_is_empty "$srcdir"; then - error "$(gettext "The source directory is empty, there is nothing to build!")" - plain "$(gettext "Aborting...")" - exit 1 - fi + warning "$(gettext "Using existing %s tree")" "src/" elif (( REPKG )); then if (( ! PKGFUNC && ! SPLITPKG )) \ && { [[ ! -d $pkgdir ]] || dir_is_empty "$pkgdir"; }; then -- 1.7.11.4

1 0

[pacman-dev] [PATCH] Notify of removed package required as optdepend
by Allan McRae 11 Aug '12

11 Aug '12

When a package is being removed, provide a notification (via a callback) if any local package requires it as an optdepend. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- I am going through the optdepends patchset submitted by Benedikt Morbach back in November [1] and adjusting/rewriting/... the patches that only add some more informational messages. [1] (https://mailman.archlinux.org/pipermail/pacman-dev/2011-November/014772.html) Here is an example of the output this patch gives: allan@mugen /home/arch/code/pacman (optdep) > sudo ./src/pacman/pacman -R tk checking dependencies... :: git optionally requires tk: gitk and git gui :: python optionally requires tk: for tkinter :: python2 optionally requires tk: for IDLE :: r optionally requires tk: tcl/tk interface Packages (1): tk-8.5.12-1 Total Removed Size: 5.21 MiB Do you want to remove these packages? [Y/n] n allan@mugen /home/arch/code/pacman (optdep) > sudo ./src/pacman/pacman -R tk r git checking dependencies... :: python optionally requires tk: for tkinter :: python2 optionally requires tk: for IDLE Packages (3): git-1.7.11.4-1 r-2.15.1-2 tk-8.5.12-1 Total Removed Size: 73.41 MiB Do you want to remove these packages? [Y/n] n lib/libalpm/alpm.h | 5 ++++- lib/libalpm/remove.c | 29 +++++++++++++++++++++++++++++ src/pacman/callback.c | 4 ++++ 3 files changed, 37 insertions(+), 1 deletion(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index ac1145b..f8928b9 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -351,7 +351,10 @@ typedef enum _alpm_event_t { /** Disk space usage will be computed for a package */ ALPM_EVENT_DISKSPACE_START, /** Disk space usage was computed for a package */ - ALPM_EVENT_DISKSPACE_DONE + ALPM_EVENT_DISKSPACE_DONE, + /** An optdepend for another package is being removed + * The requiring package and its dependency are passed to the callback */ + ALPM_EVENT_OPTDEP_REQUIRED } alpm_event_t; /** Event callback */ diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c index 4c54992..80c847e 100644 --- a/lib/libalpm/remove.c +++ b/lib/libalpm/remove.c @@ -158,6 +158,32 @@ static void remove_prepare_keep_needed(alpm_handle_t *handle, alpm_list_t *lp) } /** + * @brief Send a callback for any optdepend being removed. + * + * @param handle the context handle + * @param lp list of packages to be removed + */ +static void remove_notify_needed_optdepends(alpm_handle_t *handle, alpm_list_t *lp) +{ + alpm_list_t *i; + + for(i = _alpm_db_get_pkgcache(handle->db_local); i; i = alpm_list_next(i)) { + alpm_pkg_t *pkg = i->data; + alpm_list_t *optdeps = alpm_pkg_get_optdepends(pkg); + + if(optdeps && !_alpm_pkg_find(lp, pkg->name)) { + alpm_list_t *j; + for(j = optdeps; j; j = alpm_list_next(j)) { + alpm_depend_t *optdep = j->data; + if(_alpm_pkg_find(lp, optdep->name)) { + EVENT(handle, ALPM_EVENT_OPTDEP_REQUIRED, pkg, optdep); + } + } + } + } +} + +/** * @brief Transaction preparation for remove actions. * * This functions takes a pointer to a alpm_list_t which will be @@ -228,6 +254,9 @@ int _alpm_remove_prepare(alpm_handle_t *handle, alpm_list_t **data) } } + /* Note packages being removed that are optdepends for installed packages */ + remove_notify_needed_optdepends(handle, trans->remove); + if(!(trans->flags & ALPM_TRANS_FLAG_NODEPS)) { EVENT(handle, ALPM_EVENT_CHECKDEPS_DONE, NULL, NULL); } diff --git a/src/pacman/callback.c b/src/pacman/callback.c index 01c6b61..a51aa4b 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -239,6 +239,10 @@ void cb_event(alpm_event_t event, void *data1, void *data2) printf(_("checking available disk space...\n")); } break; + case ALPM_EVENT_OPTDEP_REQUIRED: + printf(_(":: %s optionally requires %s\n"), alpm_pkg_get_name(data1), + alpm_dep_compute_string(data2)); + break; /* all the simple done events, with fallthrough for each */ case ALPM_EVENT_FILECONFLICTS_DONE: case ALPM_EVENT_CHECKDEPS_DONE: -- 1.7.11.4

1 0

[pacman-dev] [PATCH] makepkg: implement dir_is_empty for dir content checks
by Dave Reisner 11 Aug '12

11 Aug '12

Rather than calling upon ls for this, use a proper shell function which uses globbing to determine the existance of files in a directory. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- scripts/makepkg.sh.in | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index dd4066b..262bcf8 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -2212,6 +2212,14 @@ canonicalize_path() { fi } +dir_is_empty() { + ( + shopt -s dotglob nullglob + files=("$1"/*) + (( ${#files} == 0 )) + ) +} + m4_include(library/parseopts.sh) usage() { @@ -2695,14 +2703,14 @@ if (( NOEXTRACT )); then warning "$(gettext "Skipping source integrity checks -- using existing %s tree")" "src/" warning "$(gettext "Skipping source extraction -- using existing %s tree")" "src/" - if (( NOEXTRACT )) && [[ -z $(ls "$srcdir" 2>/dev/null) ]]; then + if (( NOEXTRACT )) && dir_is_empty "$srcdir"; then error "$(gettext "The source directory is empty, there is nothing to build!")" plain "$(gettext "Aborting...")" exit 1 fi elif (( REPKG )); then if (( ! PKGFUNC && ! SPLITPKG )) \ - && [[ ! -d $pkgdir || -z $(ls "$pkgdir" 2>/dev/null) ]]; then + && { [[ ! -d $pkgdir ]] || dir_is_empty "$pkgdir"; }; then error "$(gettext "The package directory is empty, there is nothing to repackage!")" plain "$(gettext "Aborting...")" exit 1 -- 1.7.11.4

1 0

[pacman-dev] [PATCH] fixed erroneous memory access to newurl in alpm_db_remove_server
by Barbu Paul - Gheorghe 09 Aug '12

09 Aug '12

Signed-off-by: Barbu Paul - Gheorghe <barbu.paul.gheorghe(a)gmail.com> --- lib/libalpm/db.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/lib/libalpm/db.c b/lib/libalpm/db.c index bf9c3f0..26b6250 100644 --- a/lib/libalpm/db.c +++ b/lib/libalpm/db.c @@ -198,16 +198,20 @@ int SYMEXPORT alpm_db_remove_server(alpm_db_t *db, const char *url) if(!newurl) { return -1; } + db->servers = alpm_list_remove_str(db->servers, newurl, &vdata); - free(newurl); + + int ret = 1; + if(vdata) { _alpm_log(db->handle, ALPM_LOG_DEBUG, "removed server URL from database '%s': %s\n", db->treename, newurl); free(vdata); - return 0; + ret = 0; } - return 1; + free(newurl); + return ret; } /** Get the name of a package database. */ -- Barbu Paul - Gheorghe Common sense is not so common - Voltaire Visit My GitHub profile to see my open-source projects - https://github.com/paullik

2 4

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.0.3-373-g0fe5620
by dan＠archlinux.org 08 Aug '12

08 Aug '12

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 0fe562011c83229472a75dc43d34f780843e16de (commit) via 632912261a03474a14830402a1e43ae57a0557ff (commit) via c52bb7030c2f04a2e36657042ba54d5c94de1bbf (commit) via 527ae7092d98ff11c10ec92831e1297e33e946cf (commit) via a50d1bc9ab0dbe312d498de1f24760d172169413 (commit) via 024bc44a2545bc54db6e2242af799936c263dea1 (commit) via 0c95b294e9c7b947e19eda71aca3aaffc9cc3abd (commit) via 8853a6f2827739120057d4eda56a12bd3474e4c6 (commit) via c9b31ad6220e7706caf0bad55355957bfcd041cb (commit) via a818766c6e693fcc5781574d05ee02ac4b6a8dcd (commit) via 7e4aa9e52492450db1705f1057e82934b1187e0e (commit) via d51902c978144f230038e44a42ff75b587d85326 (commit) via 062204daa135feb5aad918e8842749b69de41c40 (commit) via c887ccf90553ffb00825353d98c47fea909ba611 (commit) via e0cd7b02932e5472f4c4fa30896ff73240dc9341 (commit) via 4b129d484394ce6090a9ed21782fe1df2227ad18 (commit) via b1e75d7dd663a72d90195e4907ee8fa145461fc2 (commit) via 6c8def6ae0f7b99c68da8a7a4bd943746d234754 (commit) via 7fd56118d0a751f0e488ada38101390e840bd311 (commit) via b3e82ec59e31e904b96a0d0c504af1549c8b2115 (commit) via 2042b79bcc7904afc195103dfa1fc6b3978d60f7 (commit) via 888020de9068218fafe820e631222bc85c47b453 (commit) via cca9849fc25012845b08ce877f9450e45c9d207d (commit) via aa6fe1160b39cd364a6595b7c9f56acb1cea3432 (commit) via 682c9af846718cd387da058c39967550b7eeb01f (commit) via 91d119af1c97c7f2d78bbd98c73c737bf6f7247d (commit) via 57e06394dd19191f36880aa8d1d4522a458922ca (commit) via 1a04e2e11a012162b7b3b91e4c7a8c82dd113a94 (commit) via a922d1805696b6614649a8d3588297d44f4e1192 (commit) via e8064144072e03ea1690c5aa97e863f14096a771 (commit) via d338b3981dcfd039a60fae616886707e4d69fceb (commit) from ec5e6d90294f3322b7015b422db948770ecb41b6 (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 0fe562011c83229472a75dc43d34f780843e16de Author: Allan McRae <allan(a)archlinux.org> Date: Sun Aug 5 19:36:10 2012 +1000 Move important information up in -Si output Currently, the package description is printed at the end of the -Si output. This is probably one of the more important pieces of information so should be nearer the top. Also move the package architecture up. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 632912261a03474a14830402a1e43ae57a0557ff Author: Jason St. John <jstjohn(a)purdue.edu> Date: Mon Aug 6 14:29:48 2012 -0400 PKGBUILD.vim: improve 'options' highlighting, add extra keywords This fixes the current syntax highlighting behavior in the 'options' array, which does *not* flag illegal options (e.g. typos, unsupported options). The shDoubleQuote and shSingleQuote options were the culprits. Now, if you enter `'!imptydurs'`, the typoed option will be flagged red. I also added syntax highlighting for the new options listed in `man 5 makepkg.conf`, which I believe were introduced around pacman 4.0.0. Signed-off-by: Jason St. John <jstjohn(a)purdue.edu> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit c52bb7030c2f04a2e36657042ba54d5c94de1bbf Author: Barbu Paul - Gheorghe <barbu.paul.gheorghe(a)gmail.com> Date: Tue Jul 31 21:51:31 2012 +0300 removed the condition in alpm_db_set_servers since FREELIST is NULL safe Signed-off-by: Barbu Paul - Gheorghe <barbu.paul.gheorghe(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 527ae7092d98ff11c10ec92831e1297e33e946cf Author: Barbu Paul - Gheorghe <barbu.paul.gheorghe(a)gmail.com> Date: Tue Jul 31 21:24:31 2012 +0300 added coding standard Signed-off-by: Barbu Paul - Gheorghe <barbu.paul.gheorghe(a)gmail.com> commit a50d1bc9ab0dbe312d498de1f24760d172169413 Author: Barbu Paul - Gheorghe <barbu.paul.gheorghe(a)gmail.com> Date: Tue Jul 31 21:24:30 2012 +0300 fixed typo Signed-off-by: Barbu Paul - Gheorghe <barbu.paul.gheorghe(a)gmail.com> commit 024bc44a2545bc54db6e2242af799936c263dea1 Merge: 0c95b29 a818766 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Aug 7 20:55:11 2012 -0500 Merge remote-tracking branch 'allan/working-split/vcs' commit 0c95b294e9c7b947e19eda71aca3aaffc9cc3abd Merge: 8853a6f c9b31ad Author: Dan McGee <dan(a)archlinux.org> Date: Tue Aug 7 20:54:59 2012 -0500 Merge branch 'maint' commit 8853a6f2827739120057d4eda56a12bd3474e4c6 Author: Florian Pritz <bluewind(a)xinu.at> Date: Wed Aug 1 17:24:34 2012 +0200 coding style fixes Signed-off-by: Florian Pritz <bluewind(a)xinu.at> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit a818766c6e693fcc5781574d05ee02ac4b6a8dcd Author: Allan McRae <allan(a)archlinux.org> Date: Mon Jul 16 22:25:24 2012 +1000 makepkg: delay checking for build package with pkgver() If a pkgver() function is specified, delay checking the package is built until the pkgver is updated.. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 7e4aa9e52492450db1705f1057e82934b1187e0e Author: Allan McRae <allan(a)archlinux.org> Date: Mon Jul 23 20:01:35 2012 +1000 makepkg: add hg url support Supported fragments are branch, revision and tag. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit d51902c978144f230038e44a42ff75b587d85326 Author: Allan McRae <allan(a)archlinux.org> Date: Mon Jul 23 17:00:35 2012 +1000 doc: Add --holdver information for makepkg Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 062204daa135feb5aad918e8842749b69de41c40 Author: Allan McRae <allan(a)archlinux.org> Date: Mon Jul 23 16:51:53 2012 +1000 doc: Document using svn source url Signed-off-by: Allan McRae <allan(a)archlinux.org> commit c887ccf90553ffb00825353d98c47fea909ba611 Author: Allan McRae <allan(a)archlinux.org> Date: Mon Jul 23 16:50:01 2012 +1000 doc: document automatically updating the pkgver variable Signed-off-by: Allan McRae <allan(a)archlinux.org> commit e0cd7b02932e5472f4c4fa30896ff73240dc9341 Author: Allan McRae <allan(a)archlinux.org> Date: Mon Jul 23 16:37:08 2012 +1000 doc: Document using VCS sources in a PKGBUILD Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 4b129d484394ce6090a9ed21782fe1df2227ad18 Author: Allan McRae <allan(a)archlinux.org> Date: Mon Jul 16 21:56:32 2012 +1000 makepkg: check pkgver validity after updating If a PKGBUILD has a pkgver() function, skip checking the pkgver validity until it has been updated. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit b1e75d7dd663a72d90195e4907ee8fa145461fc2 Author: Allan McRae <allan(a)archlinux.org> Date: Mon Jul 16 00:24:34 2012 +1000 makepkg: only update pkgver when all sources are available Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 6c8def6ae0f7b99c68da8a7a4bd943746d234754 Author: Allan McRae <allan(a)archlinux.org> Date: Mon Jul 16 00:16:25 2012 +1000 makepkg: add --holdver to control VCS source updating Do not update VCS sources if --holdver is used. If the VCS checkout is not present, it will still be downloaded. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 7fd56118d0a751f0e488ada38101390e840bd311 Author: Allan McRae <allan(a)archlinux.org> Date: Sun Jul 15 23:57:25 2012 +1000 makepkg: do not download VCS sources unless needed VCS sources are not needed for --geninteg or --source operations. This also prevents VCS downloads outputting to stdout, which prevented piping -g output to the PKGBUILD. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit b3e82ec59e31e904b96a0d0c504af1549c8b2115 Author: Allan McRae <allan(a)archlinux.org> Date: Sun Jul 15 15:46:29 2012 +1000 makepkg: rename myver myver is a bit generic for an internal variable name. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 2042b79bcc7904afc195103dfa1fc6b3978d60f7 Author: Allan McRae <allan(a)archlinux.org> Date: Thu Jun 7 18:12:31 2012 +1000 makepkg: add support for SVN urls Allow SVN repo sources in the form: source=("<folder>::<repo>#<fragment>") where <repo> must start with svn (e.g svn+http://) and a <fragment> can specify a revision (e.g. revision=22). Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 888020de9068218fafe820e631222bc85c47b453 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Jun 5 13:30:08 2012 +1000 makepkg: provide mechanism for auto-updating pkgver Now that VCS repos are provided in the source array, it becomes too complicated to have automatic updating pkgver as was the case with the old VCS PKGBUILDs (there can be multiple repos of different types in the source array, the VCS repo may not be the package primary source, etc). Instead provide an optional way for a PKGBUILD to update the pkgver value through the specifing of a pkgver() function that returns the new version string. This is run after all source files are downloaded so can access the VCS repo if needed. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit cca9849fc25012845b08ce877f9450e45c9d207d Author: Allan McRae <allan(a)archlinux.org> Date: Mon Jun 4 12:02:36 2012 +1000 makepkg: modify get_filepath to handle VCS sources With VCS sources, get_filepath should return the directory of the checkout. This allows backing up of the VCS checkout when using --allsource. Fixes FS#21098. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit aa6fe1160b39cd364a6595b7c9f56acb1cea3432 Author: Allan McRae <allan(a)archlinux.org> Date: Mon Jun 4 11:39:15 2012 +1000 makepkg: modify get_filename to handle VCS sources Modify get_filename to return the name of the folder with VCS sources. This fixes output issues in checksum checking. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 682c9af846718cd387da058c39967550b7eeb01f Author: Allan McRae <allan(a)archlinux.org> Date: Mon Jun 4 11:24:52 2012 +1000 makepkg: fix checksum generation with VCS sources VCS sources should have "SKIP" for their checksum value Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 91d119af1c97c7f2d78bbd98c73c737bf6f7247d Author: Allan McRae <allan(a)archlinux.org> Date: Mon Jun 4 10:37:35 2012 +1000 makepkg: allow using GIT source URLs Allow specifing GIT sources using the following syntax source=('<folder>::<repo>#<fragment>') This will download the git repo <repo> into <folder> (into $SRCDIR if set, otherwise $startdir). <repo> must start with "git", but non-git protocols are handled using (e.g.) "git+http://...". The <fragment> can be used to specify a branch, tag, or commit to build from. e.g. branch=maint. Checksum entries for git sources should be "SKIP". Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 57e06394dd19191f36880aa8d1d4522a458922ca Author: Allan McRae <allan(a)archlinux.org> Date: Mon Jun 4 10:33:52 2012 +1000 makepkg: skip integrity checking early If "SKIP" is provided for an integrity check, abort checking as soon as possible. Also swap fork to tr for bash4 conversion. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 1a04e2e11a012162b7b3b91e4c7a8c82dd113a94 Author: Allan McRae <allan(a)archlinux.org> Date: Sun Jun 3 22:57:35 2012 +1000 makepkg: generalize download_sources In order to treat all VCS sources as URLs, we need to be able to deal with more protocols. Rewrite download_sources to use a case statement so additional protocols are easily added. Also fix the use of scp to not pass the protocol in the URL (noticed by William J. Bowman <wjb(a)williamjbowman.com>) Signed-off-by: Allan McRae <allan(a)archlinux.org> commit a922d1805696b6614649a8d3588297d44f4e1192 Author: Allan McRae <allan(a)archlinux.org> Date: Mon Jun 4 09:02:03 2012 +1000 makepkg: add function to return download protocol Extract the download protocol from a source entry. Returns "local" for local source files. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit e8064144072e03ea1690c5aa97e863f14096a771 Author: Allan McRae <allan(a)archlinux.org> Date: Sun Jun 3 22:08:25 2012 +1000 makepkg: reorder source handling functions There is no actual code change here, but these related functions were all over the place which makes this code difficult to adjust. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit d338b3981dcfd039a60fae616886707e4d69fceb Author: Allan McRae <allan(a)archlinux.org> Date: Sun Jun 3 19:33:34 2012 +1000 makepkg: remove VCS package support The current VCS packaging support is really, really, really bad. It is best to strip it out completely before rewriting it. Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: HACKING | 44 +++ contrib/PKGBUILD.vim | 4 +- doc/PKGBUILD.5.txt | 100 +++--- doc/makepkg.8.txt | 12 +- lib/libalpm/db.c | 4 +- lib/libalpm/sync.c | 3 +- lib/libalpm/util.c | 4 +- scripts/makepkg.sh.in | 888 ++++++++++++++++++++++++++++++------------------- src/pacman/package.c | 5 +- src/pacman/pacman.c | 2 +- test/pacman/README | 2 +- 11 files changed, 646 insertions(+), 422 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v4.0.3-26-gc9b31ad
by dan＠archlinux.org 08 Aug '12

08 Aug '12

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 c9b31ad6220e7706caf0bad55355957bfcd041cb (commit) from b782388f1670d9ff819461cfa7e365f7e8178173 (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 c9b31ad6220e7706caf0bad55355957bfcd041cb Author: Allan McRae <allan(a)archlinux.org> Date: Sun Aug 5 20:05:42 2012 +1000 Print repo being search for replaces in debug output Given the message is repeated for each repo, it is a good idea to print the repo name in the output. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/sync.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Print repo being search for replaces in debug output
by Allan McRae 08 Aug '12

08 Aug '12

Given the message is repeated for each repo, it is a good idea to print the repo name in the output. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- Or... we could remove that output altogether. I'm not sure it is really useful. lib/libalpm/sync.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 66f7ed1..c853d4d 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -125,7 +125,8 @@ static alpm_list_t *check_replacers(alpm_handle_t *handle, alpm_pkg_t *lpkg, alpm_list_t *replacers = NULL; alpm_list_t *k; _alpm_log(handle, ALPM_LOG_DEBUG, - "searching for replacements for %s\n", lpkg->name); + "searching for replacements for %s in the [%s] repo\n", + lpkg->name, sdb->treename); for(k = _alpm_db_get_pkgcache(sdb); k; k = k->next) { int found = 0; alpm_pkg_t *spkg = k->data; -- 1.7.11.4

2 1

[pacman-dev] [PATCH] PKGBUILD.vim: improve 'options' highlighting, add extra keywords
by jstjohn＠purdue.edu 08 Aug '12

08 Aug '12

From: "Jason St. John" <jstjohn(a)purdue.edu> This fixes the current syntax highlighting behavior in the 'options' array, which does *not* flag illegal options (e.g. typos, unsupported options). The shDoubleQuote and shSingleQuote options were the culprits. Now, if you enter `'!imptydurs'`, the typoed option will be flagged red. I also added syntax highlighting for the new options listed in `man 5 makepkg.conf`, which I believe were introduced around pacman 4.0.0. Signed-off-by: Jason St. John <jstjohn(a)purdue.edu> --- contrib/PKGBUILD.vim | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/PKGBUILD.vim b/contrib/PKGBUILD.vim index 65fe489..9157063 100644 --- a/contrib/PKGBUILD.vim +++ b/contrib/PKGBUILD.vim @@ -211,10 +211,10 @@ hi def link pbValidSha512sums Number " options syn keyword pb_k_options options contained -syn match pbOptions /$no$\?$strip\|docs\|libtool\|emptydirs\|zipman\|ccache\|distcc\|makeflags\|buildflags$/ contained +syn match pbOptions /$no$\?$strip\|docs\|libtool\|emptydirs\|zipman\|purge\|upx\|fakeroot\|distcc\|color\|ccache\|check\|sign\|makeflags\|buildflags$/ contained syn match pbOptionsNeg /\!/ contained syn match pbOptionsDeprec /no/ contained -syn region pbOptionsGroup start=/^options=(/ end=/)/ contains=pb_k_options,pbOptions,pbOptionsNeg,pbOptionsDeprec,pbIllegalOption,shDoubleQuote,shSingleQuote +syn region pbOptionsGroup start=/^options=(/ end=/)/ contains=pb_k_options,pbOptions,pbOptionsNeg,pbOptionsDeprec,pbIllegalOption syn match pbIllegalOption /[^!"'()= ]/ contained contains=pbOptionsDeprec,pbOptions " noextract -- 1.7.11.4

2 1

[pacman-dev] [PATCH 0/5] Properly detect conflicts with directory symlinks
by Allan McRae 07 Aug '12

07 Aug '12

This series of patches make pacman perform conflict checking with all directory paths resovled. This means that inter-package conflicts such as /lib/foo and /usr/lib/foo when /lib -> usr/lib are detected. Similarly, if a package moves a file from /lib/foo to /usr/lib/foo when /lib -> usr/lib (i.e. the file is effectively the same), this is no longer detected as a conflict with the filesystem. A big thanks to Andrew for fixing my initial attempt at the resolving of the filelist and making my idea for efficiently storing paths that are unchanged by resolving a reality. Allan McRae (3): Add resolved_path to alpm_filelist_t Resolve file paths during inter-package conflict check Avoid upgrade conflict with unchanged effective path Andrew Gregory (2): Add _alpm_filelist_resolve _alpm_filelist_resolve: use original filenames where possible lib/libalpm/alpm.h | 1 + lib/libalpm/conflict.c | 6 ++ lib/libalpm/filelist.c | 174 ++++++++++++++++++++++++++++++++--- lib/libalpm/filelist.h | 2 + lib/libalpm/package.c | 22 ++++- test/pacman/tests/fileconflict001.py | 2 - test/pacman/tests/fileconflict013.py | 2 - test/pacman/tests/fileconflict016.py | 2 - test/pacman/tests/fileconflict017.py | 26 ++++++ 9 files changed, 217 insertions(+), 20 deletions(-) create mode 100644 test/pacman/tests/fileconflict017.py -- 1.7.11.3

3 10