July 2013 - Pacman-dev - lists.archlinux.org

[pacman-dev] Please make the colourised output exactly like that of "pacman-color"
by Xavion 29 Apr '16

29 Apr '16

Hi All, It's great that "pacman" finally has native colour support in v4.1.0. It's just a shame that it's not as good as that of "pacman-color". Without meaning any offence, it falls way short of the mark IMHO. I'm hoping you can just replicate the colourisation of "pacman-color". For your convenience, I've attached the relevant files you'd need. I'm only requesting this because "pacman-color" no longer exists. -- Regards, Xavion.

10 60

[pacman-dev] Time for a 4.1.1 release?
by Allan McRae 31 Oct '13

31 Oct '13

It looks like the bug reports for 4.1 have stopped, so I guess we should make a maintenance release. There are a couple of new strings to be translated and a couple of issues reported with translations, so I will need to get those on transifex. See: here for a list of bugs reported/fixed: https://bugs.archlinux.org/index.php?do=index&tasks=&project=3&due=111&stat… The PKGBUILD proto files could have the prepare() function added just to be more complete and fix the remaining bug is someone wants to volunteer to do that... Anything I have missed? A bug not assigned to 4.1.1 that should be fixed? Allan

4 7

[pacman-dev] [PATCH] deps.c: check for indirect deps when ordering
by Andrew Gregory 18 Oct '13

18 Oct '13

On upgrades, indirect dependencies were not being detected if there was a dependency in between them that was not part of the transaction. For example, with the dependency chain: pkg1 -> pkg2 -> pkg3, if pkg1 and pkg3 are being upgraded but not pkg2 pacman would not order pkg1 and pkg3 properly. This was particularly problematic when replacements were involved because the replaced package(s) would be removed at the start of the transaction. If an install script required the replacer and lacked a direct dependency, it could fail. Fixes FS#32764. Partially fixes FS#23011. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- The need to keep state in order to avoid getting stuck in cyclic dependencies makes this a little ugly (hence the wrapper function). If anybody has a better idea for avoiding those loops, I'd love to clean it up. lib/libalpm/deps.c | 101 +++++++++++++++++++++++++++++++++------- test/pacman/tests/replace100.py | 2 - test/pacman/tests/upgrade100.py | 44 +++++++++++++++++ 3 files changed, 127 insertions(+), 20 deletions(-) create mode 100644 test/pacman/tests/upgrade100.py diff --git a/lib/libalpm/deps.c b/lib/libalpm/deps.c index 96c49a9..adcdd3a 100644 --- a/lib/libalpm/deps.c +++ b/lib/libalpm/deps.c @@ -65,8 +65,8 @@ void _alpm_depmiss_free(alpm_depmissing_t *miss) FREE(miss); } -/* Does pkg1 depend on pkg2, ie. does pkg2 satisfy a dependency of pkg1? */ -static int _alpm_dep_edge(alpm_pkg_t *pkg1, alpm_pkg_t *pkg2) +/** Check if pkg2 satisfies a dependency of pkg1 */ +static int _alpm_pkg_depends_on(alpm_pkg_t *pkg1, alpm_pkg_t *pkg2) { alpm_list_t *i; for(i = alpm_pkg_get_depends(pkg1); i; i = i->next) { @@ -77,6 +77,84 @@ static int _alpm_dep_edge(alpm_pkg_t *pkg1, alpm_pkg_t *pkg2) return 0; } +static alpm_pkg_t *find_dep_satisfier(alpm_list_t *pkgs, alpm_depend_t *dep) +{ + alpm_list_t *i; + + for(i = pkgs; i; i = i->next) { + alpm_pkg_t *pkg = i->data; + if(_alpm_depcmp(pkg, dep)) { + return pkg; + } + } + return NULL; +} + +/** Check if pkg2 is anywhere in pkg1's dependency tree. + * @param pkg1 + * @param pkg2 + * @param targets if a package in this list is an intermediate dependency + * between pkg1 and pkg2, the pkg1 -> pkg2 dependency will not be + * reported + * @param ignore packages which should not be recursively checked for + * intermediate dependencies. Used internally for state to avoid + * getting stuck on cyclic dependencies. + * @return 1 if pkg2 is found in pkg1's dependency tree + */ +static int _alpm_pkg_in_dep_tree(alpm_pkg_t *pkg1, alpm_pkg_t *pkg2, + alpm_list_t *targets, alpm_list_t **ignore) +{ + alpm_list_t *i, *pkgs = alpm_db_get_pkgcache(pkg1->handle->db_local); + + if(_alpm_pkg_depends_on(pkg1, pkg2)) { + return 1; + } + + *ignore = alpm_list_add(*ignore, pkg1); + + /* pkg1 does not directly depend on pkg2, but if this is an upgrade + * operation there may be an indirect dependency through an installed + * dependency not part of the current transaction */ + for(i = alpm_pkg_get_depends(pkg1); i; i = i->next) { + alpm_depend_t *dep = i->data; + alpm_pkg_t *lpkg = find_dep_satisfier(pkgs, dep); + + if(!lpkg) { + continue; + } else if(alpm_list_find(targets, lpkg, _alpm_pkg_cmp)) { + /* lpkg's upgrade is part of the transaction, any dependency will be + * detected separately as pkg1 -> lpkg and lpkg -> pkg2 */ + continue; + } else if(alpm_list_find(*ignore, lpkg, _alpm_pkg_cmp)) { + /* we've already checked lpkg, move on */ + continue; + } else if(_alpm_pkg_in_dep_tree(lpkg, pkg2, targets, ignore)) { + /* we have an indirect dependency: pkg1 -> lpkg -> ... -> pkg2 */ + return 1; + } + } + + return 0; +} + +/** Check if pkg2 is anywhere in pkg1's dependency tree. + * Wrapper for _alpm_pkg_in_dep_tree to handle creating and destroying state. + * @param pkg1 + * @param pkg2 + * @param targets if a package in this list is an intermediate dependency + * between pkg1 and pkg2, the pkg1 -> pkg2 dependency will not be + * reported + * @return 1 if pkg2 is found in pkg1's dependency tree + */ +static int _alpm_dep_edge(alpm_pkg_t *pkg1, alpm_pkg_t *pkg2, + alpm_list_t *targets) +{ + alpm_list_t *ignore = NULL; + int ret = _alpm_pkg_in_dep_tree(pkg1, pkg2, targets, &ignore); + alpm_list_free(ignore); + return ret; +} + /* Convert a list of alpm_pkg_t * to a graph structure, * with a edge for each dependency. * Returns a list of vertices (one vertex = one package) @@ -101,7 +179,7 @@ static alpm_list_t *dep_graph_init(alpm_list_t *targets) for(j = vertices; j; j = j->next) { alpm_graph_t *vertex_j = j->data; alpm_pkg_t *p_j = vertex_j->data; - if(_alpm_dep_edge(p_i, p_j)) { + if(_alpm_dep_edge(p_i, p_j, targets)) { vertex_i->children = alpm_list_add(vertex_i->children, vertex_j); } @@ -229,19 +307,6 @@ static void release_filtered_depend(alpm_depend_t *dep, int nodepversion) } } -static alpm_pkg_t *find_dep_satisfier(alpm_list_t *pkgs, alpm_depend_t *dep) -{ - alpm_list_t *i; - - for(i = pkgs; i; i = i->next) { - alpm_pkg_t *pkg = i->data; - if(_alpm_depcmp(pkg, dep)) { - return pkg; - } - } - return NULL; -} - /** Find a package satisfying a specified dependency. * The dependency can include versions with depmod operators. * @param pkgs an alpm_list_t* of alpm_pkg_t where the satisfier will be searched @@ -517,7 +582,7 @@ static int can_remove_package(alpm_db_t *db, alpm_pkg_t *pkg, /* see if other packages need it */ for(i = _alpm_db_get_pkgcache(db); i; i = i->next) { alpm_pkg_t *lpkg = i->data; - if(_alpm_dep_edge(lpkg, pkg) && !alpm_pkg_find(targets, lpkg->name)) { + if(_alpm_pkg_depends_on(lpkg, pkg) && !alpm_pkg_find(targets, lpkg->name)) { return 0; } } @@ -549,7 +614,7 @@ int _alpm_recursedeps(alpm_db_t *db, alpm_list_t *targs, int include_explicit) alpm_pkg_t *pkg = i->data; for(j = _alpm_db_get_pkgcache(db); j; j = j->next) { alpm_pkg_t *deppkg = j->data; - if(_alpm_dep_edge(pkg, deppkg) + if(_alpm_pkg_depends_on(pkg, deppkg) && can_remove_package(db, deppkg, targs, include_explicit)) { alpm_pkg_t *copy; _alpm_log(db->handle, ALPM_LOG_DEBUG, "adding '%s' to the targets\n", diff --git a/test/pacman/tests/replace100.py b/test/pacman/tests/replace100.py index f94ca0f..dcb7111 100644 --- a/test/pacman/tests/replace100.py +++ b/test/pacman/tests/replace100.py @@ -41,5 +41,3 @@ self.addrule("PKG_VERSION=kernel26|2.6.37.1-1") self.addrule("FILE_EXIST=sbin/blkid") self.addrule("FILE_EXIST=foundit") - -self.expectfailure = True diff --git a/test/pacman/tests/upgrade100.py b/test/pacman/tests/upgrade100.py new file mode 100644 index 0000000..3f7a021 --- /dev/null +++ b/test/pacman/tests/upgrade100.py @@ -0,0 +1,44 @@ +self.description = "Indirect dependency ordering (FS#32764)" + +lp1 = pmpkg("fcitx-gtk2", "1.0-1"); +lp1.depends = ["gtk2"] +self.addpkg2db("local", lp1) + +lp2 = pmpkg("gtk2", "1.0-1"); +lp2.depends = ["pango"] +self.addpkg2db("local", lp2) + +lp3 = pmpkg("pango", "1.0-1"); +lp3.depends = ["harfbuzz"] +self.addpkg2db("local", lp3) + +lp4 = pmpkg("harfbuzz", "1.0-1"); +lp4.depends = ["icu"] +self.addpkg2db("local", lp4) + +lp5 = pmpkg("icu", "1.0-1"); +self.addpkg2db("local", lp5) + +sp1 = pmpkg("fcitx-gtk2", "1.0-2"); +sp1.depends = ["gtk2"] +sp1.install['post_upgrade'] = "[ -f bin/harfbuzz ] && echo > found_harfbuzz" +self.addpkg2db("sync", sp1) + +sp4 = pmpkg("harfbuzz", "1.0-2"); +sp4.depends = ["icu"] +sp4.files = ["bin/harfbuzz"] +sp4.install['post_upgrade'] = "[ -f bin/icu ] && echo > found_icu" +self.addpkg2db("sync", sp4) + +sp5 = pmpkg("icu", "1.0-2"); +sp5.files = ["bin/icu"] +self.addpkg2db("sync", sp5) + +self.args = "-Su" + +self.addrule("PACMAN_RETCODE=0") +self.addrule("PKG_VERSION=fcitx-gtk2|1.0-2") +self.addrule("PKG_VERSION=harfbuzz|1.0-2") +self.addrule("PKG_VERSION=icu|1.0-2") +self.addrule("FILE_EXIST=found_harfbuzz") +self.addrule("FILE_EXIST=found_icu") -- 1.8.2.3

3 5

[pacman-dev] A makepkg test suite
by Ashley Whetter 09 Oct '13

09 Oct '13

I've recently come across issue FS#15645 ([makepkg] needs a test suite) and I'd like to have a bash at implementing it. It seems like a good idea to get peoples ideas and thoughts first so what do you think? My first reaction is to do something similar to the pacman tests and just write a custom framework in python. Also have the output the same as the pacman tests. I think keeping the idea an environment (like in the pacman tests) seems a bit heavy handed because the only configuration done is in makepkg.conf and we can probably fake a pacman environment using a stub pacman. Or maybe we could utilise the pacman test environments! Unit testing should be easy enough because we can just call specific functions in makepkg and check the output. For functional testing I'm not really sure. As for acceptance testing we can just put different flag combinations in different test environments, and check the return code. Check the .PKGINFO. Maybe that files were put where they should be in pkg and src, as well as in the package itself. Have some PKGBUILDs that fail for various reasons like syntax, a dependency package doesn't exist. Make sure missing {,make,check}dependencies are installed. Any suggestions or ideas? Ashley

8 39

[pacman-dev] [PATCH] Make 'SRCDEST', 'PKGDEST' and 'PKGSRCDEST' respect the 'BUILDDIR'
by Techlive Zheng 03 Oct '13

03 Oct '13

--- A task has also been added to the bugtracker: https://bugs.archlinux.org/task/35498 scripts/makepkg.sh.in | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index b85b87e..c27c74d 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -2790,7 +2790,15 @@ if [[ $BUILDDIR = "$startdir" ]]; then else srcdir="$BUILDDIR/$pkgbase/src" pkgdirbase="$BUILDDIR/$pkgbase/pkg" - + if [[ $SRCDEST = "$startdir" ]]; then + SRCDEST="$BUILDDIR/$pkgbase" + fi + if [[ $PKGDEST = "$startdir" ]]; then + PKGDEST="$BUILDDIR/$pkgbase" + fi + if [[ $SRCPKGDEST = "$startdir" ]]; then + SRCPKGDEST="$BUILDDIR/$pkgbase" + fi fi # set pkgdir to something "sensible" for (not recommended) use during build() -- 1.8.2.3

3 8

[pacman-dev] [PATCH 1/3] Fix whitespace in pacsort.c and pactree.c
by Jason St. John 03 Sep '13

03 Sep '13

Replace spaces with tabs. Remove extra spaces. Signed-off-by: Jason St. John <jstjohn(a)purdue.edu> --- src/util/pacsort.c | 20 ++++++++++---------- src/util/pactree.c | 20 ++++++++++---------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/util/pacsort.c b/src/util/pacsort.c index 50b9c65..7c551c2 100644 --- a/src/util/pacsort.c +++ b/src/util/pacsort.c @@ -26,7 +26,7 @@ #include <alpm.h> -#define DELIM ' ' +#define DELIM ' ' struct buffer_t { char *mem; @@ -52,21 +52,21 @@ static struct options_t { /* A quick and dirty implementation derived from glibc */ static size_t strnlen(const char *s, size_t max) { - register const char *p; - for(p = s; *p && max--; ++p); - return (p - s); + register const char *p; + for(p = s; *p && max--; ++p); + return (p - s); } char *strndup(const char *s, size_t n) { - size_t len = strnlen(s, n); - char *new = (char *) malloc(len + 1); + size_t len = strnlen(s, n); + char *new = (char *) malloc(len + 1); - if(new == NULL) - return NULL; + if(new == NULL) + return NULL; - new[len] = '\0'; - return (char *)memcpy(new, s, len); + new[len] = '\0'; + return (char *)memcpy(new, s, len); } #endif diff --git a/src/util/pactree.c b/src/util/pactree.c index 33cf66c..2cba1b0 100644 --- a/src/util/pactree.c +++ b/src/util/pactree.c @@ -125,21 +125,21 @@ const char *configfile = CONFFILE; /* A quick and dirty implementation derived from glibc */ static size_t strnlen(const char *s, size_t max) { - register const char *p; - for(p = s; *p && max--; ++p); - return (p - s); + register const char *p; + for(p = s; *p && max--; ++p); + return (p - s); } char *strndup(const char *s, size_t n) { - size_t len = strnlen(s, n); - char *new = (char *) malloc(len + 1); + size_t len = strnlen(s, n); + char *new = (char *) malloc(len + 1); - if(new == NULL) - return NULL; + if(new == NULL) + return NULL; - new[len] = '\0'; - return (char *)memcpy(new, s, len); + new[len] = '\0'; + return (char *)memcpy(new, s, len); } #endif @@ -362,7 +362,7 @@ static void print_text(const char *pkg, const char *provision, /* print tip */ if(!pkg && provision) { - printf("%s%s%s%s [unresolvable]%s\n", tip, color->leaf1, + printf("%s%s%s%s [unresolvable]%s\n", tip, color->leaf1, provision, color->branch1, color->off); } else if(provision && strcmp(pkg, provision) != 0) { printf("%s%s%s%s%s %s%s%s\n", tip, color->leaf1, pkg, -- 1.8.3.3

3 10

[pacman-dev] [PATCH 0/5] Version the local database
by Allan McRae 08 Aug '13

08 Aug '13

With removing directory symlink support, we need to make an adjustment to the users local database to adjust any path that relied in that "feature". As this is not a readily detectable change, as was the case in our last local database adjustment, we need to add something to track the local database version. The file ".alpm_db_version" is added to the local database root. This file is automatically created whenever the local database directory is absent or empty. This store the current database version as an integer. I have chosen to use the (next) libalpm soname version so it is easy for us to track what versions are needed. Allan McRae (5): Create local database directory if it is missing Add version file when creating local database directory Add version file to empty local database Check the version of the local database during validation Extend database upgrade script to handle alpm db version 9 lib/libalpm/be_local.c | 118 +++++++++++++++++++++++++++------------- scripts/pacman-db-upgrade.sh.in | 46 ++++++++++++---- test/pacman/pmdb.py | 2 + test/pacman/pmtest.py | 3 + 4 files changed, 121 insertions(+), 48 deletions(-) -- 1.8.3.3

2 9

[pacman-dev] [PATCH 0/9] extract ini parser from parseconfig
by Andrew Gregory 07 Aug '13

07 Aug '13

This creates a generic ini parser than can be reused for hooks or other configuration files. I took a very different approach from the previous patchset by utilizing a callback that processes the options as the file is parsed. This should have a much lower memory footprint and is closer to how we were already parsing config files. Parsing differences: * Include directives can be outside a section. They can include their own sections so it made little sense to require that they be in one already. * Errors in included files are now fatal. Andrew Gregory (9): conf.c: add parse_options to section_t conf.c: move repo parsing out of _parseconfig conf.c: move directive parsing out of _parseconfig conf.c: move section handling out of _parseconfig conf.c: pass _parse_directive as a callback conf.c: extract ini parsing code to separate files ini.c: move recursion limit to a macro ini.c: reuse line buffer ini.c: make errors in includes fatal src/pacman/Makefile.am | 1 + src/pacman/conf.c | 257 ++++++++++++++----------------------------------- src/pacman/ini.c | 217 +++++++++++++++++++++++++++++++++++++++++ src/pacman/ini.h | 30 ++++++ 4 files changed, 319 insertions(+), 186 deletions(-) create mode 100644 src/pacman/ini.c create mode 100644 src/pacman/ini.h -- 1.8.3.3

3 18

[pacman-dev] [PATCH v2 1/9] pacdiff: Search and give warnings for older pacsave.[0-9]* files
by Jonathan Frazier 03 Aug '13

03 Aug '13

Signed-off-by: Jonathan Frazier <eyeswide(a)gmail.com> --- contrib/pacdiff.sh.in | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/contrib/pacdiff.sh.in b/contrib/pacdiff.sh.in index 47779d6..5ce6140 100644 --- a/contrib/pacdiff.sh.in +++ b/contrib/pacdiff.sh.in @@ -25,6 +25,7 @@ diffprog=${DIFFPROG:-vimdiff} diffsearchpath=${DIFFSEARCHPATH:-/etc} locate=0 USE_COLOR='y' +declare -a oldsaves m4_include(../scripts/library/output_format.sh) @@ -47,9 +48,9 @@ version() { cmd() { if [ $locate -eq 1 ]; then - locate -0 -e -b \*.pacnew \*.pacorig \*.pacsave + locate -0 -e -b \*.pacnew \*.pacorig \*.pacsave '*.pacsave.[0-9]*' else - find $diffsearchpath $ -name \*.pacnew -o -name \*.pacorig -o -name \*.pacsave $ -print0 + find $diffsearchpath $ -name \*.pacnew -o -name \*.pacorig -o -name \*.pacsave -o -name '*.pacsave.[0-9]*' $ -print0 fi } @@ -71,6 +72,12 @@ while IFS= read -u 3 -r -d '' pacfile; do file="${pacfile%.pac*}" file_type="pac${pacfile##*.pac}" + # add matches for pacsave.N to oldsaves array, do not prompt + if [[ $file_type = pacsave.+([0-9]) ]]; then + oldsaves+=("$pacfile") + continue + fi + msg "%s file found for %s" "$file_type" "$file" if [ ! -f "$file" ]; then warning "$file does not exist" @@ -97,6 +104,8 @@ while IFS= read -u 3 -r -d '' pacfile; do fi done 3< <(cmd) +(( ${#oldsaves[@]} )) && warning "Ignoring %s" "${oldsaves[@]}" + exit 0 # vim: set ts=2 sw=2 noet: -- 1.8.3.2

4 12

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.1.2-85-g48861f5
by allan＠archlinux.org 30 Jul '13

30 Jul '13

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 48861f509a817649f6cbda63e5ed253bdebc4f56 (commit) via d7bd40045c5a8c1240800bddf61ddac3fa4bd3d2 (commit) via e81faa9d6d2ac910720a9a87a9f469b80cf106e5 (commit) via 640324f1d4a63709822f61a9647e06d95e6c0c21 (commit) via 8e533b0363551febeab7521b21d16ff46a1722aa (commit) via 4ad6939980a9c6e6fc12c78d9d4b0d2a69dcc01b (commit) via 0f22bef8c3441fce4cc47618f644e4f818117014 (commit) via 2d9dad5e14f35657ce4f6e1f59867a0638eca3aa (commit) via a79661225a5d017864aefbacda50322ae1952df5 (commit) via 15eea825e65e4ed1e7e186cb1f3535ed04b71373 (commit) via b1b9ca01f06b74924945ea1ac75d36d1ea89c423 (commit) via 05e954d2cd71bf1031a79bd77610c6cb1da9ef54 (commit) via bcde02709120fa8d16d63d5fc797876f5f2fc465 (commit) via c4d8da47271972a58357bef95efe0b9143714a48 (commit) from 6e3ea82f9bd88fc12efbb6da24e2b52ca3cf9819 (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 48861f509a817649f6cbda63e5ed253bdebc4f56 Author: Allan McRae <allan(a)archlinux.org> Date: Sun Jul 21 16:48:31 2013 +1000 Report missing directory if we can not initialise alpm library When pacman failed to initialise the alpm library due to the database directory being missing (either via the root not existing or the database directory itself not existing), it just printed the non-informative message "could not find or read directory". Add the directory information the the error output. E.g.: error: failed to initialize alpm library (could not find or read directory: /this/does/not/exist/var/lib/pacman/) Signed-off-by: Allan McRae <allan(a)archlinux.org> commit d7bd40045c5a8c1240800bddf61ddac3fa4bd3d2 Author: Allan McRae <allan(a)archlinux.org> Date: Sun Jul 21 16:38:17 2013 +1000 Remove setlocale usage from the backend Using setlocale in the backend is bound to lead to frontend issues and we have have been using epoch in our databases since April 2007 (commit 47622eef). Remove support for old style times. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit e81faa9d6d2ac910720a9a87a9f469b80cf106e5 Author: Allan McRae <allan(a)archlinux.org> Date: Sun Jul 21 16:10:25 2013 +1000 Warn when directory ownership differs between filesystem and package We currently only warn if a directory's permissions differ, but using -Qkk on my system shows that directory permissions tend to change in packages reasonably frequently without notice. Provide a warning in such cases so that it can be altered. Example output: (1/1) reinstalling nginx warning: directory ownership differs on /var/lib/nginx/proxy/ filesystem: 33:0 package: 0:0 Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 640324f1d4a63709822f61a9647e06d95e6c0c21 Author: Allan McRae <allan(a)archlinux.org> Date: Sun Jul 21 15:38:24 2013 +1000 Only note backup file changes with -Qkk Backup files are expected to be changed and should not be flagged by -Qkk. Note changed back-up files in -Qkk but do not count them as altered. Do not report backup files in -Qqkk. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 8e533b0363551febeab7521b21d16ff46a1722aa Author: Jason St. John <jstjohn(a)purdue.edu> Date: Mon Jul 22 03:09:58 2013 +0200 Fix whitespace in makepkg.sh.in and makepkg-template.pl.in Replace spaces with tabs in one instance. Remove extra spaces. Signed-off-by: Jason St. John <jstjohn(a)purdue.edu> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 4ad6939980a9c6e6fc12c78d9d4b0d2a69dcc01b Author: Jason St. John <jstjohn(a)purdue.edu> Date: Mon Jul 22 03:09:57 2013 +0200 Fix whitespace in pacsort.c and pactree.c Replace spaces with tabs. Remove extra spaces. Signed-off-by: Jason St. John <jstjohn(a)purdue.edu> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 0f22bef8c3441fce4cc47618f644e4f818117014 Author: Jonathan Frazier <eyeswide(a)gmail.com> Date: Thu Jul 18 18:05:58 2013 -0400 pacdiff: provide an --output option to show any .pac* files This is an option to just echo's the pacnews/pacsaves instead of merging or removing them. This can be used to check the config status such as in a cron job without modifying the system. Signed-off-by: Jonathan Frazier <eyeswide(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 2d9dad5e14f35657ce4f6e1f59867a0638eca3aa Author: Jonathan Frazier <eyeswide(a)gmail.com> Date: Thu Jul 18 17:50:44 2013 -0400 pacdiff: make pacmandb search the default type. Signed-off-by: Jonathan Frazier <eyeswide(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit a79661225a5d017864aefbacda50322ae1952df5 Author: Jonathan Frazier <eyeswide(a)gmail.com> Date: Thu Jul 18 17:12:32 2013 -0400 pacdiff: improve speed, accuracy finding active configs using pacmandb This is a new search type, using -p or --pacmandb options. It reads config file locations directly from the local pacman db. It will find active configs anywhere they are defined in installed packages. It is not dependant on outside configs such as updatedb.conf or scanning a large set of directories for find. This will find more pacnews than find when searching with the current default of /etc, and it is faster than both find and updatedb when searching the entire fs. When run directly after an update, the local db is more likely to be cached than all files in /etc or / as other methods read. This will increase performance further post upgrade. After a package is removed and a pacsave is created, this method will not find these pacsaves until the base config is added to the local db again. These files have no influence in a working system and only take up a few blocks of disk space. Active configs need to be dealt with immediately to keep a system working. pacsaves related to removed configs can remain for weeks or months without problems. I would recommend occasionally running other methods such as --locate to remove them. Signed-off-by: Jonathan Frazier <eyeswide(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 15eea825e65e4ed1e7e186cb1f3535ed04b71373 Author: Jonathan Frazier <eyeswide(a)gmail.com> Date: Tue Jul 16 12:38:15 2013 -0400 pacdiff: rework search type handling, add --find option Change cmd tests to if (( USE_FIND ))... as it is cleaner. All search cmds have an option and a variable initialized to zero. The active option should be set to 1. Add a switch to exclude multiple search options. set the default when all are equal to zero. Signed-off-by: Jonathan Frazier <eyeswide(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit b1b9ca01f06b74924945ea1ac75d36d1ea89c423 Author: Jonathan Frazier <eyeswide(a)gmail.com> Date: Mon Jul 15 13:02:33 2013 -0400 pacdiff: add --nocolor option for the terminally challenged. Allow colors to be disabled for use on broken/serial terminals. Signed-off-by: Jonathan Frazier <eyeswide(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 05e954d2cd71bf1031a79bd77610c6cb1da9ef54 Author: Jonathan Frazier <eyeswide(a)gmail.com> Date: Mon Jul 15 12:56:03 2013 -0400 pacdiff: allow multiple separated options loop over arguments, this will allow adding options such as --nocolor Signed-off-by: Jonathan Frazier <eyeswide(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit bcde02709120fa8d16d63d5fc797876f5f2fc465 Author: Jonathan Frazier <eyeswide(a)gmail.com> Date: Mon Jul 15 11:00:30 2013 -0400 pacdiff: clean up and reword --help Clean up and reword --help get rid of all the echos to make it easier to read in source. Signed-off-by: Jonathan Frazier <eyeswide(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit c4d8da47271972a58357bef95efe0b9143714a48 Author: Jonathan Frazier <eyeswide(a)gmail.com> Date: Sun Jul 7 09:45:02 2013 -0400 pacdiff: Search and give warnings for older pacsave.[0-9]* files Signed-off-by: Jonathan Frazier <eyeswide(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: contrib/pacdiff.sh.in | 125 ++++++++++++++++++++++++++++++++++------- lib/libalpm/add.c | 16 +++++- lib/libalpm/util.c | 15 ----- scripts/makepkg-template.pl.in | 2 +- scripts/makepkg.sh.in | 8 +-- src/pacman/check.c | 53 +++++++++++++---- src/pacman/conf.c | 4 +- src/util/pacsort.c | 20 +++---- src/util/pactree.c | 20 +++---- test/pacman/tests/query002.py | 5 +- test/pacman/tests/sync1100.py | 3 - 11 files changed, 189 insertions(+), 82 deletions(-) hooks/post-receive -- The official pacman repository

1 0