summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--contrib/bacman.sh.in8
-rw-r--r--lib/libalpm/conflict.c9
-rw-r--r--scripts/makepkg.sh.in1
3 files changed, 12 insertions, 6 deletions
diff --git a/contrib/bacman.sh.in b/contrib/bacman.sh.in
index ffb9d6d3..7895a40c 100644
--- a/contrib/bacman.sh.in
+++ b/contrib/bacman.sh.in
@@ -4,7 +4,8 @@
# This script rebuilds an already installed package using metadata
# stored into the pacman database and system files
#
-# (c) 2008 - locci <carlocci_at_gmail_dot_com>
+# Copyright (c) 2008 locci <carlocci_at_gmail_dot_com>
+# Copyright (c) 2008-2012 Pacman Development Team <pacman-dev@archlinux.org>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -90,7 +91,6 @@ if [[ -r ~/.makepkg.conf ]]; then
source ~/.makepkg.conf
fi
-pkg_arch=${CARCH:-'unknown'}
pkg_dest="${PKGDEST:-$PWD}"
pkg_pkger=${PACKAGER:-'Unknown Packager'}
@@ -186,7 +186,6 @@ fi
echo "# $(LC_ALL=C date)" >> .PKGINFO
echo "#" >> .PKGINFO
-cat "$pkg_dir"/{desc,files} |
while read i; do
if [[ -z $i ]]; then
continue;
@@ -216,6 +215,7 @@ while read i; do
;;
%ARCH%)
echo "arch = $i" >> .PKGINFO
+ pkg_arch="$i"
;;
%BUILDDATE%)
echo "builddate = $(date -u "+%s")" >> .PKGINFO
@@ -251,7 +251,7 @@ while read i; do
echo "backup = ${i%%$'\t'*}" >> .PKGINFO
;;
esac
-done
+done < <(cat "$pkg_dir"/{desc,files})
comp_files=".PKGINFO"
diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c
index fd4eff13..60691c94 100644
--- a/lib/libalpm/conflict.c
+++ b/lib/libalpm/conflict.c
@@ -340,6 +340,8 @@ static int dir_belongsto_pkg(alpm_handle_t *handle, const char *dirpath,
/* check directory is actually in package - used for subdirectory checks */
if(!_alpm_filelist_contains(alpm_pkg_get_files(pkg), dirpath)) {
+ _alpm_log(handle, ALPM_LOG_DEBUG,
+ "directory %s not in package %s\n", dirpath, pkg->name);
return 0;
}
@@ -356,6 +358,9 @@ static int dir_belongsto_pkg(alpm_handle_t *handle, const char *dirpath,
}
if(_alpm_filelist_contains(alpm_pkg_get_files(i->data), dirpath)) {
+ _alpm_log(handle, ALPM_LOG_DEBUG,
+ "file %s also in package %s\n", dirpath,
+ ((alpm_pkg_t*)i->data)->name);
return 0;
}
}
@@ -390,6 +395,8 @@ static int dir_belongsto_pkg(alpm_handle_t *handle, const char *dirpath,
continue;
} else {
closedir(dir);
+ _alpm_log(handle, ALPM_LOG_DEBUG,
+ "unowned file %s found in directory\n", path);
return 0;
}
}
@@ -557,7 +564,7 @@ alpm_list_t *_alpm_db_find_fileconflicts(alpm_handle_t *handle,
sprintf(dir, "%s/", filestr);
if(_alpm_filelist_contains(alpm_pkg_get_files(dbpkg), dir)) {
_alpm_log(handle, ALPM_LOG_DEBUG,
- "check if all files in %s belong to %s\n",
+ "checking if all files in %s belong to %s\n",
dir, dbpkg->name);
resolved_conflict = dir_belongsto_pkg(handle, dir, dbpkg);
}
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index 6f7de278..b30e9d04 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -643,7 +643,6 @@ get_integlist() {
generate_checksums() {
msg "$(gettext "Generating checksums for source files...")"
- plain ""
if ! type -p openssl >/dev/null; then
error "$(gettext "Cannot find the %s binary required for generating sourcefile checksums.")" "openssl"