[pacman-dev] [PATCH] Fix makepkg create_xdelta() and add warning

[Ash Milsted]

Hi,
This fixes a trivial bug that prevents create_xdelta() from finding any
old package versions, cleans up its use of messages, and adds a warning
stressing the importance of distributing the deltas with the tarball
from the same makepkg run.
There are no functionality changes. Please apply.

Ash (aka thikasabrik)

--- scripts/makepkg.in	2007-06-02 16:28:47.000000000 +0100
+++ scripts/makepkg.in.1	2007-06-02 16:46:47.000000000 +0100
@@ -608,12 +608,12 @@
 
 	local pkg_file=$1
 	local cache_dir="/var/cache/pacman/pkg" # TODO: autoconf me
-	local old_versions=( $(ls {"$cache_dir","$PKGDEST"}/${pkgname}-*-${CARCH}.${PKGEXT} 2>/dev/null) )
+	local old_versions=( $(ls {"$cache_dir","$PKGDEST"}/${pkgname}-*-${CARCH}${PKGEXT} 2>/dev/null) )
 
 	# Check to see if we have any old versions to create deltas with
 	local old_file old_version latest_version base_file
 	for old_file in "${old_versions[@]}"; do
-		old_version=$(basename "${old_file%-$CARCH.$PKGEXT}")
+		old_version=$(basename "${old_file%-$CARCH$PKGEXT}")
 		old_version=${old_version#$pkgname-}
 	
 		# old_version may include the target package, only use the old versions
@@ -624,7 +624,7 @@
 	done
 
 	if [ "$base_file" != "" ]; then
-		msg "Making delta from version $latest_version"
+		msg "$(gettext "Making delta from version $latest_version")"
 		local delta_file="$PKGDEST/$pkgname-${old_version}_to_$pkgver-$pkgrel-$CARCH.delta"
 
 		# xdelta will decompress base_file & pkg_file into TMP_DIR (or /tmp if TMP_DIR is unset)
@@ -636,9 +636,11 @@
 		#
 		# makepkg and pacman must use the same compression algorithm or the delta generated
 		# package may not match, producing md5 checksum errors.
+		msg2 "$(gettext "Recreating package tarball from delta to match up md5 signatures")"
+		msg2 "$(gettext "NOTE: the delta should ONLY be distributed with this tarball")"
 		xdelta patch "$delta_file" "$base_file" "$pkg_file"
 	else
-		msg "No previous version found, skipping xdelta"
+		warning "$(gettext "No previous version found, skipping xdelta")"
 	fi
 }
 
-