- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] use getuid instead of geteuid
by Allan McRae 20 Oct '13

20 Oct '13

From: "Vladimir A. Nazarenko" <naszar(a)ya.ru> Signed-off-by: Vladimir A. Nazarenko <naszar(a)ya.ru> --- src/pacman/pacman.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index f485692..169fbc2 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -1030,7 +1030,7 @@ int main(int argc, char *argv[]) size_t i; struct sigaction new_action, old_action; const int signals[] = { SIGHUP, SIGINT, SIGTERM, SIGSEGV }; - uid_t myuid = geteuid(); + uid_t myuid = getuid(); /* Set signal handlers */ /* Set up the structure to specify the new action. */ -- 1.8.4

1 1

[pacman-dev] [PATCH v3] pacman -Si/-Qi: Autodetect best fitting file size unit
by Florian Pritz 19 Oct '13

19 Oct '13

I've tracked this back to e223366 and it looks like this just forces KiB because back then humanize_size didn't exist, but the size was just divided by 1024 to keep it somewhat readable. When humanize_size got introduced in 3c8a448 this was just carried over. The unit detected for "Download Size" is reused for "Installed Size" to make it easier to read. Signed-off-by: Florian Pritz <bluewind(a)xinu.at> --- v3: - Autodetect size for "Installed" if it's the only one (-Qi doesn't display Download/Compressed) - fix test suite src/pacman/package.c | 7 +++++-- test/pacman/tests/query006.py | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/pacman/package.c b/src/pacman/package.c index eab2873..9572615 100644 --- a/src/pacman/package.c +++ b/src/pacman/package.c @@ -165,16 +165,19 @@ void dump_pkg_full(alpm_pkg_t *pkg, int extra) deplist_display(_("Conflicts With :"), alpm_pkg_get_conflicts(pkg), cols); deplist_display(_("Replaces :"), alpm_pkg_get_replaces(pkg), cols); - size = humanize_size(alpm_pkg_get_size(pkg), 'K', 2, &label); + size = humanize_size(alpm_pkg_get_size(pkg), '\0', 2, &label); if(from == ALPM_PKG_FROM_SYNCDB) { printf("%s%s%s %6.2f %s\n", config->colstr.title, _("Download Size :"), config->colstr.nocolor, size, label); } else if(from == ALPM_PKG_FROM_FILE) { printf("%s%s%s %6.2f %s\n", config->colstr.title, _("Compressed Size:"), config->colstr.nocolor, size, label); + } else { + // autodetect size for "Installed Size" + label = "\0"; } - size = humanize_size(alpm_pkg_get_isize(pkg), 'K', 2, &label); + size = humanize_size(alpm_pkg_get_isize(pkg), label[0], 2, &label); printf("%s%s%s %6.2f %s\n", config->colstr.title, _("Installed Size :"), config->colstr.nocolor, size, label); diff --git a/test/pacman/tests/query006.py b/test/pacman/tests/query006.py index 0f6f762..5defd87 100644 --- a/test/pacman/tests/query006.py +++ b/test/pacman/tests/query006.py @@ -20,7 +20,7 @@ self.addrule("PACMAN_RETCODE=0") self.addrule("PACMAN_OUTPUT=^Name.*%s" % p.name) self.addrule("PACMAN_OUTPUT=^Description.*%s" % p.desc) -self.addrule("PACMAN_OUTPUT=^Installed Size.*9765625.00 KiB") +self.addrule("PACMAN_OUTPUT=^Installed Size.*9.31 GiB") self.addrule("PACMAN_OUTPUT=^Build Date.* 2065") self.addrule("PACMAN_OUTPUT=^Install Date.* 2286") -- 1.8.4

1 0

[pacman-dev] [PATCH] [RFC] pacman -Si/-Qi: Autodetect best fitting file size unit
by Florian Pritz 19 Oct '13

19 Oct '13

I've tracked this back to e223366 and it looks like this just forces KiB because back then humanize_size didn't exist, but the size was just divided by 1024 to keep it somewhat readable. When humanize_size got introduced in 3c8a448 this was just carried over. Signed-off-by: Florian Pritz <bluewind(a)xinu.at> --- Similar to this -Su also forces units to MiB, but I'm unsure if this should be changed since -Su outputs a nice table and having everything in the same unit makes comparing packages easier. Any input on this patch and the -Su situation would be welcome. src/pacman/package.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pacman/package.c b/src/pacman/package.c index eab2873..b10207b 100644 --- a/src/pacman/package.c +++ b/src/pacman/package.c @@ -165,7 +165,7 @@ void dump_pkg_full(alpm_pkg_t *pkg, int extra) deplist_display(_("Conflicts With :"), alpm_pkg_get_conflicts(pkg), cols); deplist_display(_("Replaces :"), alpm_pkg_get_replaces(pkg), cols); - size = humanize_size(alpm_pkg_get_size(pkg), 'K', 2, &label); + size = humanize_size(alpm_pkg_get_size(pkg), '\0', 2, &label); if(from == ALPM_PKG_FROM_SYNCDB) { printf("%s%s%s %6.2f %s\n", config->colstr.title, _("Download Size :"), config->colstr.nocolor, size, label); @@ -174,7 +174,7 @@ void dump_pkg_full(alpm_pkg_t *pkg, int extra) config->colstr.nocolor, size, label); } - size = humanize_size(alpm_pkg_get_isize(pkg), 'K', 2, &label); + size = humanize_size(alpm_pkg_get_isize(pkg), '\0', 2, &label); printf("%s%s%s %6.2f %s\n", config->colstr.title, _("Installed Size :"), config->colstr.nocolor, size, label); -- 1.8.4

4 6

[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] [PATCH] libalpm/db.c: default to ALPM_DB_USAGE_ALL
by Andrew Gregory 18 Oct '13

18 Oct '13

This allows existing front-ends other than pacman to continue working normally. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- lib/libalpm/db.c | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/libalpm/db.c b/lib/libalpm/db.c index 3245d64..528b04b 100644 --- a/lib/libalpm/db.c +++ b/lib/libalpm/db.c @@ -323,6 +323,7 @@ alpm_db_t *_alpm_db_new(const char *treename, int is_local) } else { db->status &= ~DB_STATUS_LOCAL; } + db->usage = ALPM_DB_USAGE_ALL; return db; } -- 1.8.4.1

1 0

[pacman-dev] [PATCH] makepkg: allow empty source arrays
by Andrew Gregory 18 Oct '13

18 Oct '13

Necessary for metapackages. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- scripts/makepkg.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 8050d0b..ccc1ddf 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -2248,7 +2248,7 @@ check_sanity() { done local idx=("${!source[@]}") - if (( (idx[-1] + 1) != ${#source[*]} )); then + if (( ${#source[*]} > 0 && (idx[-1] + 1) != ${#source[*]} )); then error "$(gettext "Sparse arrays are not allowed for source")" ret=1 fi -- 1.8.4.1

1 0

[pacman-dev] [PATCH] Update existing sources instead of removing them first for VCS sources.
by Lukáš Jirkovský 16 Oct '13

16 Oct '13

Previously, the sources in $srcdir were always removed prior building. After this change the sources are only updated. This makes incremental builds possible. Also this goes in line with the current behaviour for other types of sources, where the sources are just being overwritten without being removed first. --- scripts/makepkg.sh.in | 33 +++++++++++++++++++++------------ 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 67ec240..bb4297c 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -516,9 +516,11 @@ extract_bzr() { msg2 "$(gettext "Creating working copy of %s %s repo...")" "${repo}" "bzr" pushd "$srcdir" &>/dev/null - rm -rf "${dir##*/}" - if ! { bzr checkout "$dir" "${revision[@]}" --lightweight && + if [[ -d "${dir##*/}" ]]; then + cd_safe "${dir##*/}" + bzr update + elif ! { bzr checkout "$dir" "${revision[@]}" --lightweight && ( cd "$repo" && bzr pull "$dir" -q --overwrite "${revision[@]}" ); }; then error "$(gettext "Failure while creating working copy of %s %s repo")" "${repo}" "bzr" plain "$(gettext "Aborting...")" @@ -580,9 +582,11 @@ extract_git() { msg2 "$(gettext "Creating working copy of %s %s repo...")" "${repo}" "git" pushd "$srcdir" &>/dev/null - rm -rf "${dir##*/}" - - if ! git clone "$dir"; then + if [[ -d "${dir##*/}" ]]; then + cd_safe "${dir##*/}" + git pull + cd_safe "$srcdir" + elif ! git clone "$dir"; then error "$(gettext "Failure while creating working copy of %s %s repo")" "${repo}" "git" plain "$(gettext "Aborting...")" exit 1 @@ -607,7 +611,7 @@ extract_git() { fi if [[ -n $ref ]]; then - if ! git checkout -b makepkg $ref; then + if ! git checkout -B makepkg $ref; then error "$(gettext "Failure while creating working copy of %s %s repo")" "${repo}" "git" plain "$(gettext "Aborting...")" exit 1 @@ -662,7 +666,6 @@ extract_hg() { msg2 "$(gettext "Creating working copy of %s %s repo...")" "${repo}" "hg" pushd "$srcdir" &>/dev/null - rm -rf "${dir##*/}" local ref if [[ -n $fragment ]]; then @@ -677,7 +680,10 @@ extract_hg() { esac fi - if ! hg clone "${ref[@]}" "$dir" "${dir##*/}"; then + if [[ -d "${dir##*/}" ]]; then + cd_safe "${dir##*/}" + hg pull -u + elif ! hg clone "${ref[@]}" "$dir" "${dir##*/}"; then error "$(gettext "Failure while creating working copy of %s %s repo")" "${repo}" "hg" plain "$(gettext "Aborting...")" exit 1 @@ -739,7 +745,6 @@ extract_svn() { msg2 "$(gettext "Creating working copy of %s %s repo...")" "${repo}" "svn" pushd "$srcdir" &>/dev/null - rm -rf "${dir##*/}" local ref if [[ -n $fragment ]]; then @@ -754,16 +759,20 @@ extract_svn() { esac fi - cp -a "$dir" . - if [[ -n ${ref} ]]; then - cd_safe "$(get_filename "$netfile")" + cd_safe "$dir" if ! svn update -r ${ref}; then error "$(gettext "Failure while creating working copy of %s %s repo")" "${repo}" "svn" plain "$(gettext "Aborting...")" fi fi + if [[ -d "${dir##*/}" ]]; then + cp -au "$dir" "$srcdir" + else + cp -a "$dir" . + fi + popd &>/dev/null } -- 1.8.4

4 10

[pacman-dev] [PATCH] makepkg.8: Document remaining environmental variables
by Allan McRae 16 Oct '13

16 Oct '13

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- doc/makepkg.8.txt | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/doc/makepkg.8.txt b/doc/makepkg.8.txt index d047aee..699d6bc 100644 --- a/doc/makepkg.8.txt +++ b/doc/makepkg.8.txt @@ -210,7 +210,7 @@ set up a development PKGBUILD. Environment Variables --------------------- -*PACMAN*:: +**PACMAN**:: The command that will be used to check for missing dependencies and to install and remove packages. Pacman's -Qq, -Rns, -S, -T, and -U operations must be supported by this command. If the variable is not @@ -224,6 +224,14 @@ Environment Variables Folder where the downloaded sources will be stored. Overrides the corresponding value defined in linkman:makepkg.conf[5]. +**SRCPKGDEST=**"/path/to/folder":: + Folder where source package files will be stored. Overrides the + corresponding value defined in linkman:makepkg.conf[5]. + +**LOGDEST=**"/path/to/folder":: + Folder where generated log files will be stored. Overrides the + corresponding value defined in linkman:makepkg.conf[5]. + **PACKAGER=**"John Doe <john(a)doe.com>":: String to identify the creator of the resulting package. Overrides the corresponding value defined in linkman:makepkg.conf[5]. @@ -236,6 +244,10 @@ Environment Variables Force build for a specific architecture. Useful for cross-compiling. Overrides the corresponding value defined in linkman:makepkg.conf[5]. +**PKGEXT=**".pkg.tar.gz", **SRCEXT=**".src.tar.gz":: + Sets the compression used when making compiled or source packages. + Overrides the corresponding value defined in linkman:makepkg.conf[5]. + **GNUPGHOME=**"/path/to/folder":: Folder where the gpg keyring for signing the built package is stored. -- 1.8.4

2 2

[pacman-dev] [PATCH v3] Indicate ignored packages in -Qu output
by Allan McRae 16 Oct '13

16 Oct '13

Add "[ignored]" in the "pacman -Qu" output after packages that have their upgrades ignored. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- src/pacman/query.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/pacman/query.c b/src/pacman/query.c index bd50b05..8814307 100644 --- a/src/pacman/query.c +++ b/src/pacman/query.c @@ -324,6 +324,10 @@ static int display(alpm_pkg_t *pkg) if(config->op_q_upgrade) { alpm_pkg_t *newpkg = alpm_sync_newversion(pkg, alpm_get_syncdbs(config->handle)); printf(" -> %s%s%s", colstr->version, alpm_pkg_get_version(newpkg), colstr->nocolor); + + if(alpm_pkg_should_ignore(config->handle, pkg)) { + printf(" %s", _("[ignored]")); + } } printf("\n"); -- 1.8.4

1 0

[pacman-dev] [PATCH] Expose alpm_pkg_should_ignore
by Allan McRae 16 Oct '13

16 Oct '13

This function is useful for frontends to annotate package upgrades that will be ignored. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/alpm.h | 9 +++++++++ lib/libalpm/deps.c | 4 ++-- lib/libalpm/package.c | 2 +- lib/libalpm/package.h | 1 - lib/libalpm/sync.c | 14 +++++++------- 5 files changed, 19 insertions(+), 11 deletions(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 29b9f37..2c8c1e6 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -793,6 +793,15 @@ alpm_list_t *alpm_pkg_compute_requiredby(alpm_pkg_t *pkg); */ alpm_list_t *alpm_pkg_compute_optionalfor(alpm_pkg_t *pkg); +/** Test if a package should be ignored. + * Checks if the package is ignored via IgnorePkg, or if the package is + * in a group ignored via IgnoreGroup. + * @param handle the context handle + * @param pkg the package to test + * @return 1 if the package should be ignored, 0 otherwise + */ +int alpm_pkg_should_ignore(alpm_handle_t *handle, alpm_pkg_t *pkg); + /** @name Package Property Accessors * Any pointer returned by these functions points to internal structures * allocated by libalpm. They should not be freed nor modified in any diff --git a/lib/libalpm/deps.c b/lib/libalpm/deps.c index 745eac1..cf7605e 100644 --- a/lib/libalpm/deps.c +++ b/lib/libalpm/deps.c @@ -664,7 +664,7 @@ static alpm_pkg_t *resolvedep(alpm_handle_t *handle, alpm_depend_t *dep, pkg = _alpm_db_get_pkgfromcache(db, dep->name); if(pkg && _alpm_depcmp_literal(pkg, dep) && !alpm_pkg_find(excluding, pkg->name)) { - if(_alpm_pkg_should_ignore(handle, pkg)) { + if(alpm_pkg_should_ignore(handle, pkg)) { int install = 0; if(prompt) { QUESTION(handle, ALPM_QUESTION_INSTALL_IGNOREPKG, pkg, @@ -693,7 +693,7 @@ static alpm_pkg_t *resolvedep(alpm_handle_t *handle, alpm_depend_t *dep, * possibly be the same string */ if(pkg->name_hash != dep->name_hash && _alpm_depcmp(pkg, dep) && !alpm_pkg_find(excluding, pkg->name)) { - if(_alpm_pkg_should_ignore(handle, pkg)) { + if(alpm_pkg_should_ignore(handle, pkg)) { int install = 0; if(prompt) { QUESTION(handle, ALPM_QUESTION_INSTALL_IGNOREPKG, diff --git a/lib/libalpm/package.c b/lib/libalpm/package.c index cfdbb3f..1294f8e 100644 --- a/lib/libalpm/package.c +++ b/lib/libalpm/package.c @@ -753,7 +753,7 @@ alpm_pkg_t SYMEXPORT *alpm_pkg_find(alpm_list_t *haystack, const char *needle) * * @return 1 if the package should be ignored, 0 otherwise */ -int _alpm_pkg_should_ignore(alpm_handle_t *handle, alpm_pkg_t *pkg) +int SYMEXPORT alpm_pkg_should_ignore(alpm_handle_t *handle, alpm_pkg_t *pkg) { alpm_list_t *groups = NULL; diff --git a/lib/libalpm/package.h b/lib/libalpm/package.h index b7c3358..07b043c 100644 --- a/lib/libalpm/package.h +++ b/lib/libalpm/package.h @@ -148,7 +148,6 @@ alpm_pkg_t *_alpm_pkg_load_internal(alpm_handle_t *handle, int _alpm_pkg_cmp(const void *p1, const void *p2); int _alpm_pkg_compare_versions(alpm_pkg_t *local_pkg, alpm_pkg_t *pkg); -int _alpm_pkg_should_ignore(alpm_handle_t *handle, alpm_pkg_t *pkg); #endif /* _ALPM_PACKAGE_H */ diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index a4b1bb8..066f1f2 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -93,8 +93,8 @@ static int check_literal(alpm_handle_t *handle, alpm_pkg_t *lpkg, _alpm_log(handle, ALPM_LOG_DEBUG, "new version of '%s' found (%s => %s)\n", lpkg->name, lpkg->version, spkg->version); /* check IgnorePkg/IgnoreGroup */ - if(_alpm_pkg_should_ignore(handle, spkg) - || _alpm_pkg_should_ignore(handle, lpkg)) { + if(alpm_pkg_should_ignore(handle, spkg) + || alpm_pkg_should_ignore(handle, lpkg)) { _alpm_log(handle, ALPM_LOG_WARNING, _("%s: ignoring package upgrade (%s => %s)\n"), lpkg->name, lpkg->version, spkg->version); } else { @@ -105,8 +105,8 @@ static int check_literal(alpm_handle_t *handle, alpm_pkg_t *lpkg, } else if(cmp < 0) { if(enable_downgrade) { /* check IgnorePkg/IgnoreGroup */ - if(_alpm_pkg_should_ignore(handle, spkg) - || _alpm_pkg_should_ignore(handle, lpkg)) { + if(alpm_pkg_should_ignore(handle, spkg) + || alpm_pkg_should_ignore(handle, lpkg)) { _alpm_log(handle, ALPM_LOG_WARNING, _("%s: ignoring package downgrade (%s => %s)\n"), lpkg->name, lpkg->version, spkg->version); } else { @@ -148,8 +148,8 @@ static alpm_list_t *check_replacers(alpm_handle_t *handle, alpm_pkg_t *lpkg, int doreplace = 0; alpm_pkg_t *tpkg; /* check IgnorePkg/IgnoreGroup */ - if(_alpm_pkg_should_ignore(handle, spkg) - || _alpm_pkg_should_ignore(handle, lpkg)) { + if(alpm_pkg_should_ignore(handle, spkg) + || alpm_pkg_should_ignore(handle, lpkg)) { _alpm_log(handle, ALPM_LOG_WARNING, _("ignoring package replacement (%s-%s => %s-%s)\n"), lpkg->name, lpkg->version, spkg->name, spkg->version); @@ -270,7 +270,7 @@ alpm_list_t SYMEXPORT *alpm_find_group_pkgs(alpm_list_t *dbs, if(alpm_pkg_find(ignorelist, pkg->name)) { continue; } - if(_alpm_pkg_should_ignore(db->handle, pkg)) { + if(alpm_pkg_should_ignore(db->handle, pkg)) { ignorelist = alpm_list_add(ignorelist, pkg); int install = 0; QUESTION(db->handle, ALPM_QUESTION_INSTALL_IGNOREPKG, pkg, -- 1.8.4

1 0