Merge branch 'maint'

Conflicts:
	lib/libalpm/deps.c

1 files changed, 5 insertions, 1 deletions

diff --git a/scripts/pacman-db-upgrade.sh.in b/scripts/pacman-db-upgrade.sh.in
index 0813acc6..17d8beb4 100644
--- a/scripts/pacman-db-upgrade.sh.in
+++ b/scripts/pacman-db-upgrade.sh.in
@@ -83,10 +83,14 @@ if [[ -n $1 ]]; then
 	dbroot="$1"
 fi
 
-if [[ ! -d $dbroot || ! -d $dbroot/local ]]; then
+if [[ ! -d $dbroot ]]; then
 	die "$(gettext "%s does not exist or is not a directory.")" "$dbroot"
 fi
 
+if [[ ! -d $dbroot/local ]]; then
+	die "$(gettext "%s is not a pacman database directory.")" "$dbroot"
+fi
+
 if [[ ! -w $dbroot ]]; then
 	die "$(gettext "You must have correct permissions to upgrade the database.")"
 fi