summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2011-04-15 18:41:49 -0500
committerDan McGee <dan@archlinux.org>2011-04-15 18:41:49 -0500
commitefd8ae483fe587feccd32c90fbee474aa19a5557 (patch)
tree02dfc2f4597d69dcaa18050b604f5c1df5450cd4 /contrib
parent202ade1398ca57070e56de24c3639f3048ecd784 (diff)
parent21a881ec6875dccf42bd602496fa93c5a61f2640 (diff)
Merge branch 'maint'
Conflicts: lib/libalpm/alpm.h lib/libalpm/trans.c Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'contrib')
-rwxr-xr-xcontrib/bacman.in16
1 files changed, 7 insertions, 9 deletions
diff --git a/contrib/bacman.in b/contrib/bacman.in
index bd545180..ebcc386d 100755
--- a/contrib/bacman.in
+++ b/contrib/bacman.in
@@ -174,7 +174,7 @@ fi
echo "# $(LC_ALL=C date)" >> .PKGINFO
echo "#" >> .PKGINFO
-cat "$pkg_dir"/{desc,files,depends} |
+cat "$pkg_dir"/{desc,files} |
while read i; do
if [[ -z "$i" ]]; then
continue;
@@ -220,14 +220,6 @@ while read i; do
%REPLACES%)
echo "replaces = $i" >> .PKGINFO
;;
-
- # files
- %BACKUP%)
- # strip the md5sum after the tab
- echo "backup = ${i%%$'\t'*}" >> .PKGINFO
- ;;
-
- # depends
%DEPENDS%)
echo "depend = $i" >> .PKGINFO
;;
@@ -240,6 +232,12 @@ while read i; do
%PROVIDES%)
echo "provides = $i" >> .PKGINFO
;;
+
+ # files
+ %BACKUP%)
+ # strip the md5sum after the tab
+ echo "backup = ${i%%$'\t'*}" >> .PKGINFO
+ ;;
esac
done