summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Fyfe <andrew@neptune-one.net>2007-07-10 17:31:13 +0200
committerDan McGee <dan@archlinux.org>2007-07-10 17:35:32 +0200
commit9a9928f1b88f4fa08826aa83ff16e6ef38bd4e6c (patch)
treed3d18882c4a8bef019f9496e7552fadbd96ee547
parent142225fd7db358655cc35acb365a983624a3a5bd (diff)
downloadpacman-9a9928f1b88f4fa08826aa83ff16e6ef38bd4e6c.tar.gz
pacman-9a9928f1b88f4fa08826aa83ff16e6ef38bd4e6c.tar.xz
Remove conflict message for no-existent files.
Signed-off-by: Andrew Fyfe <andrew@neptune-one.net>
-rw-r--r--lib/libalpm/conflict.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c
index 3755fcd7..adaba1a9 100644
--- a/lib/libalpm/conflict.c
+++ b/lib/libalpm/conflict.c
@@ -506,7 +506,8 @@ alpm_list_t *_alpm_db_find_conflicts(pmdb_t *db, pmtrans_t *trans, char *root)
path, p1->name, NULL);
}
} else {
- _alpm_log(PM_LOG_DEBUG, "%s is a directory, not a conflict", path);
+ if(S_ISDIR(buf.st_mode))
+ _alpm_log(PM_LOG_DEBUG, "%s is a directory, not a conflict", path);
}
}
alpm_list_free_inner(tmpfiles, &free);