[game-data-packager] 36/39: Don't clean up OUTFILE from YAML games

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch master
in repository game-data-packager.

commit 6a53ab2a8b375d8bc1f59582e4be4256556c007e
Author: Simon McVittie <smcv at debian.org>
Date:   Sun Jan 11 01:37:20 2015 +0000

    Don't clean up OUTFILE from YAML games
---
 game-data-packager | 17 ++---------------
 lib/via-python     |  6 ++----
 2 files changed, 4 insertions(+), 19 deletions(-)

diff --git a/game-data-packager b/game-data-packager
index 3da98f8..24b7864 100755
--- a/game-data-packager
+++ b/game-data-packager
@@ -119,12 +119,7 @@ debug "long: $LONGNAME"
 WORKDIR=`mktemp -t -d game-data-packager.XXXXXX`
 debug "WORKDIR=$WORKDIR"
 cleanup() {
-	# some magic so that methods can produce multiple debs
-	if [ "$OUTFILE" = "*.deb" ]; then
-		for deb in "$WORKDIR"/*.deb; do
-			rm -f "$deb"
-		done
-	else
+	if [ "$OUTFILE" != "" ]; then
 		if [ "$PRESERVE" != "yes" ] && [ -f "$OUTFILE" ]; then
 			rm "$OUTFILE"
 		fi
@@ -148,15 +143,7 @@ trap cleanup EXIT
 go "$@"
 
 if [ "$PRESERVE" = "yes" ]; then
-	if [ "$OUTFILE" = "*.deb" ]; then
-		for deb in "$WORKDIR"/*.deb; do
-			if [ ${deb} = "$WORKDIR/*.deb" ]; then
-				break
-			fi
-			realdeb="$(realpath "$deb")"
-			echo "generated \"$realdeb\"."
-		done
-	else
+	if [ "$OUTFILE" != "" ]; then
 		echo "generated \"$OUTFILE\"."
 	fi
 fi
diff --git a/lib/via-python b/lib/via-python
index b3d1fef..e59b965 100644
--- a/lib/via-python
+++ b/lib/via-python
@@ -14,7 +14,6 @@ gdp_data_driven () {
     (
     export ETCDIR
     export DATADIR
-    export OUTDIR
     export WORKDIR
     PYTHONPATH="$LIBDIR"
     export PYTHONPATH
@@ -47,9 +46,8 @@ gdp_data_driven () {
         exit $?
     fi
 
-    # Special value to signal that gdp should just install every .deb
-    # in $WORKDIR
-    OUTFILE="*.deb"
+    # Special value to signal that we did our own installation
+    OUTFILE=""
 
     # The Python code does the installation if necessary, so we don't
     # need to deal with this in shell script any more

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/game-data-packager.git