August 2012 - Pacman-dev - lists.archlinux.org

[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

[pacman-dev] [PATCH] Mark already installed optional dependencies
by Arokux B. 05 Aug '12

05 Aug '12

This patch adds "[installed]" prefix to already installed optional dependency. Signed-off-by: Arokux arokux(a)gmail.com --- src/pacman/util.c | 43 +++++++++++++++++++++++++++++-------------- 1 file changed, 29 insertions(+), 14 deletions(-) diff --git a/src/pacman/util.c b/src/pacman/util.c index a5242ae..d0a049e 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -1189,19 +1189,40 @@ static int depend_cmp(const void *d1, const void *d2) return ret; } +alpm_list_t *optdeps_to_strings(alpm_list_t *optdeps) +{ + alpm_list_t *i, *optstrings = NULL; + alpm_db_t *localdb = alpm_get_localdb(config->handle); + + /* turn optdepends list into a text list */ + for(i = optdeps; i; i = alpm_list_next(i)) { + alpm_depend_t *optdep = i->data; + char *optdepstring = alpm_dep_compute_string(optdep); + + if(alpm_find_satisfier(alpm_db_get_pkgcache(localdb), optdepstring)) { + char *optdepstring_in; + pm_asprintf(&optdepstring_in, _("[installed] %s"), optdepstring); + free(optdepstring); + + optdepstring = optdepstring_in; + optdepstring_in = NULL; + } + + optstrings = alpm_list_add(optstrings, optdepstring); + } + + return optstrings; +} + void display_new_optdepends(alpm_pkg_t *oldpkg, alpm_pkg_t *newpkg) { - alpm_list_t *i, *old, *new, *optdeps, *optstrings = NULL; + alpm_list_t *old, *new, *optdeps, *optstrings = NULL; old = alpm_pkg_get_optdepends(oldpkg); new = alpm_pkg_get_optdepends(newpkg); optdeps = alpm_list_diff(new, old, depend_cmp); - /* turn optdepends list into a text list */ - for(i = optdeps; i; i = alpm_list_next(i)) { - alpm_depend_t *optdep = i->data; - optstrings = alpm_list_add(optstrings, alpm_dep_compute_string(optdep)); - } + optstrings = optdeps_to_strings(optdeps); if(optstrings) { printf(_("New optional dependencies for %s\n"), alpm_pkg_get_name(newpkg)); @@ -1214,15 +1235,9 @@ void display_new_optdepends(alpm_pkg_t *oldpkg, alpm_pkg_t *newpkg) void display_optdepends(alpm_pkg_t *pkg) { - alpm_list_t *i, *optdeps, *optstrings = NULL; + alpm_list_t *optstrings = NULL; - optdeps = alpm_pkg_get_optdepends(pkg); - - /* turn optdepends list into a text list */ - for(i = optdeps; i; i = alpm_list_next(i)) { - alpm_depend_t *optdep = i->data; - optstrings = alpm_list_add(optstrings, alpm_dep_compute_string(optdep)); - } + optstrings = optdeps_to_strings(alpm_pkg_get_optdepends(pkg)); if(optstrings) { printf(_("Optional dependencies for %s\n"), alpm_pkg_get_name(pkg));

2 5

[pacman-dev] [PATCH 00/11] [RFC] Pacman Color
by Daniel Wallace 05 Aug '12

05 Aug '12

I wanted to fix up the pacman-color patch from the aur, as suggested by Allan. And I decided to put all of the seperate color commands into color.c . Not being very experienced in C, please feel free to be as nitpicky as you want, I did this mostly for the learning experience, as well as to start cleaning up the patch. Thanks Daniel Wallace (11): load color into config Add color commands for stuff in util Load color configs add color to callback add color to package.c Add color to pacman.c add color to query.c Add color to remove.c Add color to sync.c Add empty config file Document color contrib/bash_completion.in | 2 +- contrib/zsh_completion.in | 1 + doc/pacman.8.txt | 3 + etc/Makefile.am | 5 +- etc/color.conf.in | 46 +++ etc/pacman.conf.in | 1 + src/pacman/Makefile.am | 3 + src/pacman/callback.c | 164 ++++++++-- src/pacman/color.c | 796 +++++++++++++++++++++++++++++++++++++++++++++ src/pacman/color.h | 77 +++++ src/pacman/conf.c | 5 + src/pacman/conf.h | 6 +- src/pacman/package.c | 190 ++++++++--- src/pacman/pacman.c | 85 +++-- src/pacman/query.c | 57 +++- src/pacman/remove.c | 7 +- src/pacman/sync.c | 151 +++++++-- src/pacman/util.c | 35 +- src/pacman/util.h | 6 + 19 files changed, 1467 insertions(+), 173 deletions(-) create mode 100644 etc/color.conf.in create mode 100644 src/pacman/color.c create mode 100644 src/pacman/color.h -- 1.7.11.4

2 12

[pacman-dev] [PATCH] Move important information up in -Si output
by Allan McRae 05 Aug '12

05 Aug '12

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> --- I suppose this is a bit subjective, but having the package description at the end of -Si has annoyed me long enough that I decided to fix it! src/pacman/package.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/pacman/package.c b/src/pacman/package.c index fe04d40..fc869b1 100644 --- a/src/pacman/package.c +++ b/src/pacman/package.c @@ -141,6 +141,8 @@ void dump_pkg_full(alpm_pkg_t *pkg, int extra) } string_display(_("Name :"), alpm_pkg_get_name(pkg), cols); string_display(_("Version :"), alpm_pkg_get_version(pkg), cols); + string_display(_("Description :"), alpm_pkg_get_desc(pkg), cols); + string_display(_("Architecture :"), alpm_pkg_get_arch(pkg), cols); string_display(_("URL :"), alpm_pkg_get_url(pkg), cols); list_display(_("Licenses :"), alpm_pkg_get_licenses(pkg), cols); list_display(_("Groups :"), alpm_pkg_get_groups(pkg), cols); @@ -164,7 +166,6 @@ void dump_pkg_full(alpm_pkg_t *pkg, int extra) printf(_("Installed Size : %6.2f %s\n"), size, label); string_display(_("Packager :"), alpm_pkg_get_packager(pkg), cols); - string_display(_("Architecture :"), alpm_pkg_get_arch(pkg), cols); string_display(_("Build Date :"), bdatestr, cols); if(from == ALPM_PKG_FROM_LOCALDB) { string_display(_("Install Date :"), idatestr, cols); @@ -198,8 +199,6 @@ void dump_pkg_full(alpm_pkg_t *pkg, int extra) alpm_siglist_cleanup(&siglist); } - string_display(_("Description :"), alpm_pkg_get_desc(pkg), cols); - /* Print additional package info if info flag passed more than once */ if(from == ALPM_PKG_FROM_LOCALDB && extra) { dump_pkg_backups(pkg); -- 1.7.11.4

1 0

[pacman-dev] [PATCH v2] coding style fixes
by Florian Pritz 02 Aug '12

02 Aug '12

Signed-off-by: Florian Pritz <bluewind(a)xinu.at> --- This replaces "[PATCH] util.c: coding style fix" lib/libalpm/db.c | 2 +- lib/libalpm/util.c | 4 ++-- src/pacman/pacman.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/libalpm/db.c b/lib/libalpm/db.c index bf9c3f0..953f2af 100644 --- a/lib/libalpm/db.c +++ b/lib/libalpm/db.c @@ -281,7 +281,7 @@ alpm_list_t SYMEXPORT *alpm_db_get_groupcache(alpm_db_t *db) } /** Searches a database. */ -alpm_list_t SYMEXPORT *alpm_db_search(alpm_db_t *db, const alpm_list_t* needles) +alpm_list_t SYMEXPORT *alpm_db_search(alpm_db_t *db, const alpm_list_t *needles) { ASSERT(db != NULL, return NULL); db->handle->pm_errno = 0; diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index 0196f3b..033058a 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -65,9 +65,9 @@ * @return pointer to the first token in str if str is not NULL, NULL if * str is NULL */ -char* strsep(char** str, const char* delims) +char *strsep(char **str, const char *delims) { - char* token; + char *token; if(*str==NULL) { /* No more tokens */ diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 73d5be9..478196e 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -719,7 +719,7 @@ static int parseargs(int argc, char *argv[]) * @param argc * @param argv */ -static void cl_to_log(int argc, char* argv[]) +static void cl_to_log(int argc, char *argv[]) { size_t size = 0; int i; -- 1.7.11.3

1 0

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

02 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 ec5e6d90294f3322b7015b422db948770ecb41b6 (commit) via d46bb6b27b05579acf5665368c111b4cc41eedcb (commit) via 72d3713cc7865af5f4d91410ad56ed4287be6109 (commit) via 70d8c2150e33d1a0b9e09d72c5091d661383d641 (commit) via 41dae689520b0af0b5226117e77572a24954f075 (commit) via fa2eadcec75e8e54a4bb3cf1f38a07ec71784032 (commit) via eb871553912f5cf4ab3cb8aade73cf2a24dcb82c (commit) via 6f47dfc9203e45ef91afdc772c27eb7034bf6590 (commit) via e3772f765474b4678beec6d88e3a1c56fd591aa4 (commit) via 49dbebcc36e33f1df88a12b63cc3876838eb9dc5 (commit) from 7193ce1ecd0089545d100fd11647cb346d15331b (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 ec5e6d90294f3322b7015b422db948770ecb41b6 Author: Pierre Schmitz <pierre(a)archlinux.de> Date: Mon Jun 18 16:46:25 2012 +0200 pacman-key: Use lsign_keys function in --populate This reduces code duplication and also makes --populate a non-interactive function. Signed-off-by: Pierre Schmitz <pierre(a)archlinux.de> commit d46bb6b27b05579acf5665368c111b4cc41eedcb Author: Allan McRae <allan(a)archlinux.org> Date: Wed Jul 18 12:09:24 2012 +1000 Split _alpm_filelist_operation function To improve conflict checking, we will need to make these functions diverge to an extent where having two separate functions will be preferable. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 72d3713cc7865af5f4d91410ad56ed4287be6109 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Jul 12 15:29:59 2012 -0500 Move filelist functions into separate source file We have a few of these and might as well gather them together. This also cleans up the code a bit by using an enum instead of integer values, as well as makes a "search for file in filelist" function public so frontends can do better than straight linear search of the filelists. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 70d8c2150e33d1a0b9e09d72c5091d661383d641 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Wed Jul 18 09:46:53 2012 +1000 pactest: avoid upgrade conflict with unchanged effective path Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 41dae689520b0af0b5226117e77572a24954f075 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Jul 17 19:13:03 2012 +1000 pactest: Do not remove symlink to directory if a to be installed package uses it If a pacakge has a directory symlink (e.g. /lib -> usr/lib), do not allow it to be removed if any other package is trying to install a file into that path (e.g. /lib/foo). This is because the local database can become invalidated if the symlink is removed after the package with file /lib/foo is installed (sync702.py). If the symlink is removed before the file is installed (sync701.py), the upgrade is actually a success, but we can not guarantee the ordering so both cases should fail. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit fa2eadcec75e8e54a4bb3cf1f38a07ec71784032 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Jul 17 13:22:08 2012 +1000 pactest: Do not remove symlink to directory if local package uses that path If we have a symlink to a directory (e.g. /lib -> usr/lib), then we can not remove it if a local package thinks it has files in the symlink directory (e.g. /lib/foo), because this will invalidate the local file database. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit eb871553912f5cf4ab3cb8aade73cf2a24dcb82c Author: Allan McRae <allan(a)archlinux.org> Date: Tue Jul 17 01:26:54 2012 +1000 pactest: conflict between files having same effective path Note failure to detect a conflict between files having the same effective path across packages due to a directory symlink. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 6f47dfc9203e45ef91afdc772c27eb7034bf6590 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Jul 17 01:15:53 2012 +1000 pactest: conflict between directory and a file Note failure to detect a conflict between a directory in one package and a file in the other when the directory is not currently on the filesystem. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit e3772f765474b4678beec6d88e3a1c56fd591aa4 Author: Allan McRae <allan(a)archlinux.org> Date: Wed Jul 11 11:36:36 2012 +1000 Add pactest for empty subdirectory conflict The wrong test file was inadvertantly committed in 44e9fdd0. Add the correct test and tidy up the test which was committed. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 49dbebcc36e33f1df88a12b63cc3876838eb9dc5 Author: Jan Alexander Steffens (heftig) <jan.steffens(a)gmail.com> Date: Sat Jun 16 01:12:22 2012 +0200 Allow cleaning only some cachedirs When cleaning the cache, ask for each cachedir separately. Allan: add some white space in output Signed-off-by: Jan Alexander Steffens (heftig) <jan.steffens(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/Makefile.am | 1 + lib/libalpm/alpm.h | 16 ++- lib/libalpm/be_local.c | 1 + lib/libalpm/be_package.c | 1 + lib/libalpm/conflict.c | 105 +++------------ lib/libalpm/conflict.h | 3 - lib/libalpm/filelist.c | 137 ++++++++++++++++++++ lib/libalpm/{group.h => filelist.h} | 21 +-- lib/libalpm/package.c | 9 -- lib/libalpm/package.h | 1 - lib/libalpm/remove.c | 8 +- scripts/pacman-key.sh.in | 3 +- src/pacman/sync.c | 35 ++--- .../{fileconflict012.py => fileconflict011.py} | 6 +- test/pacman/tests/fileconflict012.py | 2 +- test/pacman/tests/fileconflict013.py | 22 ++++ test/pacman/tests/fileconflict015.py | 17 +++ test/pacman/tests/fileconflict016.py | 23 ++++ test/pacman/tests/sync700.py | 22 ++++ test/pacman/tests/sync701.py | 22 ++++ test/pacman/tests/sync702.py | 22 ++++ 21 files changed, 341 insertions(+), 136 deletions(-) create mode 100644 lib/libalpm/filelist.c copy lib/libalpm/{group.h => filelist.h} (63%) copy test/pacman/tests/{fileconflict012.py => fileconflict011.py} (74%) create mode 100644 test/pacman/tests/fileconflict013.py create mode 100644 test/pacman/tests/fileconflict015.py create mode 100644 test/pacman/tests/fileconflict016.py create mode 100644 test/pacman/tests/sync700.py create mode 100644 test/pacman/tests/sync701.py create mode 100644 test/pacman/tests/sync702.py hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] use the default visibility attribute when debugging is enabled, i.e. all symbols will be visible
by Barbu Paul - Gheorghe 01 Aug '12

01 Aug '12

Signed-off-by: Barbu Paul - Gheorghe <barbu.paul.gheorghe(a)gmail.com> --- m4/acinclude.m4 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/m4/acinclude.m4 b/m4/acinclude.m4 index f57a515..2829845 100644 --- a/m4/acinclude.m4 +++ b/m4/acinclude.m4 @@ -83,7 +83,8 @@ AC_DEFUN([GCC_VISIBILITY_CC],[ if test $visibility_cv_cc = yes; then AC_DEFINE([ENABLE_VISIBILITY_CC], 1, [Define if symbol visibility C support is enabled.]) fi - AM_CONDITIONAL([ENABLE_VISIBILITY_CC], test "x$visibility_cv_cc" = "xyes") + AM_CONDITIONAL([ENABLE_VISIBILITY_CC], + test "x$visibility_cv_cc" = "xyes" -a "x$debug" != "xyes") fi ]) -- Barbu Paul - Gheorghe Common sense is not so common - Voltaire Visit My GitHub profile to see my open-source projects - https://github.com/paullik

3 3

[pacman-dev] [PATCH] util.c: coding style fix
by Florian Pritz 01 Aug '12

01 Aug '12

Signed-off-by: Florian Pritz <bluewind(a)xinu.at> --- lib/libalpm/util.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index 0196f3b..33cef71 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -65,9 +65,9 @@ * @return pointer to the first token in str if str is not NULL, NULL if * str is NULL */ -char* strsep(char** str, const char* delims) +char *strsep(char** str, const char* delims) { - char* token; + char *token; if(*str==NULL) { /* No more tokens */ -- 1.7.11.4

1 0