Merge branch 'maint'
This commit is contained in:
commit
7193ce1ecd
|
@ -4,7 +4,8 @@
|
||||||
# This script rebuilds an already installed package using metadata
|
# This script rebuilds an already installed package using metadata
|
||||||
# stored into the pacman database and system files
|
# 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
|
# 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
|
# 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
|
source ~/.makepkg.conf
|
||||||
fi
|
fi
|
||||||
|
|
||||||
pkg_arch=${CARCH:-'unknown'}
|
|
||||||
pkg_dest="${PKGDEST:-$PWD}"
|
pkg_dest="${PKGDEST:-$PWD}"
|
||||||
pkg_pkger=${PACKAGER:-'Unknown Packager'}
|
pkg_pkger=${PACKAGER:-'Unknown Packager'}
|
||||||
|
|
||||||
|
@ -186,7 +186,6 @@ fi
|
||||||
echo "# $(LC_ALL=C date)" >> .PKGINFO
|
echo "# $(LC_ALL=C date)" >> .PKGINFO
|
||||||
echo "#" >> .PKGINFO
|
echo "#" >> .PKGINFO
|
||||||
|
|
||||||
cat "$pkg_dir"/{desc,files} |
|
|
||||||
while read i; do
|
while read i; do
|
||||||
if [[ -z $i ]]; then
|
if [[ -z $i ]]; then
|
||||||
continue;
|
continue;
|
||||||
|
@ -216,6 +215,7 @@ while read i; do
|
||||||
;;
|
;;
|
||||||
%ARCH%)
|
%ARCH%)
|
||||||
echo "arch = $i" >> .PKGINFO
|
echo "arch = $i" >> .PKGINFO
|
||||||
|
pkg_arch="$i"
|
||||||
;;
|
;;
|
||||||
%BUILDDATE%)
|
%BUILDDATE%)
|
||||||
echo "builddate = $(date -u "+%s")" >> .PKGINFO
|
echo "builddate = $(date -u "+%s")" >> .PKGINFO
|
||||||
|
@ -251,7 +251,7 @@ while read i; do
|
||||||
echo "backup = ${i%%$'\t'*}" >> .PKGINFO
|
echo "backup = ${i%%$'\t'*}" >> .PKGINFO
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
done
|
done < <(cat "$pkg_dir"/{desc,files})
|
||||||
|
|
||||||
comp_files=".PKGINFO"
|
comp_files=".PKGINFO"
|
||||||
|
|
||||||
|
|
|
@ -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 */
|
/* check directory is actually in package - used for subdirectory checks */
|
||||||
if(!_alpm_filelist_contains(alpm_pkg_get_files(pkg), dirpath)) {
|
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;
|
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)) {
|
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;
|
return 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -390,6 +395,8 @@ static int dir_belongsto_pkg(alpm_handle_t *handle, const char *dirpath,
|
||||||
continue;
|
continue;
|
||||||
} else {
|
} else {
|
||||||
closedir(dir);
|
closedir(dir);
|
||||||
|
_alpm_log(handle, ALPM_LOG_DEBUG,
|
||||||
|
"unowned file %s found in directory\n", path);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -557,7 +564,7 @@ alpm_list_t *_alpm_db_find_fileconflicts(alpm_handle_t *handle,
|
||||||
sprintf(dir, "%s/", filestr);
|
sprintf(dir, "%s/", filestr);
|
||||||
if(_alpm_filelist_contains(alpm_pkg_get_files(dbpkg), dir)) {
|
if(_alpm_filelist_contains(alpm_pkg_get_files(dbpkg), dir)) {
|
||||||
_alpm_log(handle, ALPM_LOG_DEBUG,
|
_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);
|
dir, dbpkg->name);
|
||||||
resolved_conflict = dir_belongsto_pkg(handle, dir, dbpkg);
|
resolved_conflict = dir_belongsto_pkg(handle, dir, dbpkg);
|
||||||
}
|
}
|
||||||
|
|
|
@ -643,7 +643,6 @@ get_integlist() {
|
||||||
|
|
||||||
generate_checksums() {
|
generate_checksums() {
|
||||||
msg "$(gettext "Generating checksums for source files...")"
|
msg "$(gettext "Generating checksums for source files...")"
|
||||||
plain ""
|
|
||||||
|
|
||||||
if ! type -p openssl >/dev/null; then
|
if ! type -p openssl >/dev/null; then
|
||||||
error "$(gettext "Cannot find the %s binary required for generating sourcefile checksums.")" "openssl"
|
error "$(gettext "Cannot find the %s binary required for generating sourcefile checksums.")" "openssl"
|
||||||
|
|
Loading…
Reference in New Issue