moparisthebest/pacman
1
0
Fork 0
mirror of https://github.com/moparisthebest/pacman synced 2024-10-31 15:45:03 -04:00
Code Issues Releases Wiki Activity

Merge branch 'maint'

Browse Source
This commit is contained in:
Allan McRae 2015-01-11 18:57:54 +10:00
commit 77ca6e4062
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/paccache.sh.in
View File

@ -256,6 +256,8 @@ while :; do
delete=1 ;; delete=1 ;;
-u|--uninstalled) -u|--uninstalled)
IFS=$'\n' read -r -d '' -a ign < <(pacman -Qq) 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[@]}") blacklist+=("${ign[@]}")
unset ign ;; unset ign ;;
-V|--version) -V|--version)

8
scripts/makepkg.sh.in
View File

@ -362,11 +362,11 @@ download_file() {
# replace %o by the temporary dlfile if it exists # replace %o by the temporary dlfile if it exists
if [[ ${cmdline[*]} = *%o* ]]; then if [[ ${cmdline[*]} = *%o* ]]; then
dlfile=$filename.part dlfile=$filename.part
cmdline=("${cmdline[@]//%o/"$dlfile"}") cmdline=("${cmdline[@]//%o/$dlfile}")
fi fi
# add the URL, either in place of %u or at the end # add the URL, either in place of %u or at the end
if [[ ${cmdline[*]} = *%u* ]]; then if [[ ${cmdline[*]} = *%u* ]]; then
cmdline=("${cmdline[@]//%u/"$url"}") cmdline=("${cmdline[@]//%u/$url}")
else else
cmdline+=("$url") cmdline+=("$url")
fi fi
@ -1833,7 +1833,7 @@ tidy_install() {
# check existence of backup files # check existence of backup files
local file local file
for file in "${backup[@]}"; do 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" warning "$(gettext "%s entry file not in package : %s")" "backup" "$file"
fi fi
done done
@ -2140,6 +2140,8 @@ write_pkginfo() {
local size="$(@DUPATH@ @DUFLAGS@)" local size="$(@DUPATH@ @DUFLAGS@)"
size="$(( ${size%%[^0-9]*} * 1024 ))" size="$(( ${size%%[^0-9]*} * 1024 ))"
merge_arch_attrs
msg2 "$(gettext "Generating %s file...")" ".PKGINFO" msg2 "$(gettext "Generating %s file...")" ".PKGINFO"
printf "# Generated by makepkg %s\n" "$makepkg_version" printf "# Generated by makepkg %s\n" "$makepkg_version"
printf "# using %s\n" "$(fakeroot -v)" printf "# using %s\n" "$(fakeroot -v)"