mirror of
https://github.com/moparisthebest/pacman
synced 2024-10-31 15:45:03 -04:00
Merge branch 'maint'
This commit is contained in:
commit
77ca6e4062
@ -256,6 +256,8 @@ while :; do
|
||||
delete=1 ;;
|
||||
-u|--uninstalled)
|
||||
IFS=$'\n' read -r -d '' -a ign < <(pacman -Qq)
|
||||
# pacman -Qq may exit with an error, thus making ign an empty array
|
||||
(( ${#ign[@]} )) || die 'failed to retrieve the list of installed packages'
|
||||
blacklist+=("${ign[@]}")
|
||||
unset ign ;;
|
||||
-V|--version)
|
||||
|
@ -362,11 +362,11 @@ download_file() {
|
||||
# replace %o by the temporary dlfile if it exists
|
||||
if [[ ${cmdline[*]} = *%o* ]]; then
|
||||
dlfile=$filename.part
|
||||
cmdline=("${cmdline[@]//%o/"$dlfile"}")
|
||||
cmdline=("${cmdline[@]//%o/$dlfile}")
|
||||
fi
|
||||
# add the URL, either in place of %u or at the end
|
||||
if [[ ${cmdline[*]} = *%u* ]]; then
|
||||
cmdline=("${cmdline[@]//%u/"$url"}")
|
||||
cmdline=("${cmdline[@]//%u/$url}")
|
||||
else
|
||||
cmdline+=("$url")
|
||||
fi
|
||||
@ -1833,7 +1833,7 @@ tidy_install() {
|
||||
# check existence of backup files
|
||||
local file
|
||||
for file in "${backup[@]}"; do
|
||||
if [[ ! -f $file ]]; then
|
||||
if [[ ! -f $file && ! -h $file ]]; then
|
||||
warning "$(gettext "%s entry file not in package : %s")" "backup" "$file"
|
||||
fi
|
||||
done
|
||||
@ -2140,6 +2140,8 @@ write_pkginfo() {
|
||||
local size="$(@DUPATH@ @DUFLAGS@)"
|
||||
size="$(( ${size%%[^0-9]*} * 1024 ))"
|
||||
|
||||
merge_arch_attrs
|
||||
|
||||
msg2 "$(gettext "Generating %s file...")" ".PKGINFO"
|
||||
printf "# Generated by makepkg %s\n" "$makepkg_version"
|
||||
printf "# using %s\n" "$(fakeroot -v)"
|
||||
|
Loading…
Reference in New Issue
Block a user