summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2011-06-28 04:42:22 +0200
committerDan McGee <dan@archlinux.org>2011-06-28 04:43:58 +0200
commit9aab1440cacf143b62f05ccfac0e7917ef9d4c45 (patch)
tree966bfe1d161ca122734ac0c844450ee806a893ad
parent97e1dd9318389cf9424d06b78f5b9f5b9d452f7d (diff)
downloadpacman-9aab1440cacf143b62f05ccfac0e7917ef9d4c45.tar.gz
pacman-9aab1440cacf143b62f05ccfac0e7917ef9d4c45.tar.xz
Revert "Merge branch 'master' of git://projects.archlinux.org/pacman"
This reverts the merge of 2d32a9a3a348d25d6d0f3d12752399bf7fdf6570, which reverts the commit 8581694ceb63f4ed2854206b38574599c3d9df28. Thanks Dave for the dirty branch and non-clean rebase! :) Dave broke it.
-rw-r--r--scripts/makepkg.sh.in2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index 391e1752..ed5cdef7 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -2086,7 +2086,7 @@ if (( INFAKEROOT )); then
tidy_install
fi
else
- warning "$(gettext "Repackaging without the use of a %s function is deprecated." "package()")"
+ warning "$(gettext "Repackaging without the use of a %s function is deprecated.")" "package()"
plain "$(gettext "File permissions may not be preserved.")"
fi
else