[pacman-dev] [PATCH] Allow xdelta options to be set per package.

[Nathan Jones]

Setting xdelta (or !xdelta) in the options array in a PKGBUILD will
override the makepkg.conf setting.

Signed-off-by: Nathan Jones <nathanj at insightbb.com>
---
 scripts/makepkg.sh.in |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index f3e4741..a8d7747 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -868,7 +868,9 @@ create_package() {
 }
 
 create_xdelta() {
-	if [ "$(check_buildenv xdelta)" != "y" ]; then
+	if [ "$(check_option xdelta)" = "n" ]; then
+		return
+	elif [ "$(check_buildenv xdelta)" != "y" -a "$(check_option xdelta)" != "y" ]; then
 		return
 	elif [ ! "$(type -p xdelta)" ]; then
 		error "$(gettext "Cannot find the xdelta binary! Is xdelta installed?")"
-- 
1.5.3.5