summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2010-12-13 02:53:20 +0100
committerDan McGee <dan@archlinux.org>2010-12-13 02:53:20 +0100
commita35610beba1b12c37ec26ec878d3701dd669db42 (patch)
tree62928bff67d6f63166da6a7736ab958f54297179 /lib
parent4fb3cfc48f626f84329c78351d6a8710255a35e3 (diff)
parent5c8083baa4a831b16adcc3c1c35d7438f5bdcc3e (diff)
downloadpacman-a35610beba1b12c37ec26ec878d3701dd669db42.tar.gz
pacman-a35610beba1b12c37ec26ec878d3701dd669db42.tar.xz
Merge branch 'maint'
Conflicts: lib/libalpm/be_local.c lib/libalpm/trans.c
Diffstat (limited to 'lib')
-rw-r--r--lib/libalpm/trans.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/libalpm/trans.c b/lib/libalpm/trans.c
index 4dac5981..5bc2c911 100644
--- a/lib/libalpm/trans.c
+++ b/lib/libalpm/trans.c
@@ -106,7 +106,7 @@ static alpm_list_t *check_arch(alpm_list_t *pkgs)
for(i = pkgs; i; i = i->next) {
pmpkg_t *pkg = i->data;
const char *pkgarch = alpm_pkg_get_arch(pkg);
- if(strcmp(pkgarch,arch) != 0 && strcmp(pkgarch,"any") != 0) {
+ if(pkgarch && strcmp(pkgarch, arch) && strcmp(pkgarch, "any")) {
char *string;
const char *pkgname = alpm_pkg_get_name(pkg);
const char *pkgver = alpm_pkg_get_version(pkg);