r2496 - people/goneri/update-pkg-games

[Eddy Petrisor]

Author: eddyp-guest
Date: 2007-03-09 16:37:36 +0000 (Fri, 09 Mar 2007)
New Revision: 2496

Modified:
   people/goneri/update-pkg-games/refresh.pl
   people/goneri/update-pkg-games/update_pkg.sh
Log:
more debranding

Modified: people/goneri/update-pkg-games/refresh.pl
===================================================================
--- people/goneri/update-pkg-games/refresh.pl	2007-03-09 16:36:54 UTC (rev 2495)
+++ people/goneri/update-pkg-games/refresh.pl	2007-03-09 16:37:36 UTC (rev 2496)
@@ -13,6 +13,14 @@
 # import configuration
 my $USER=$ENV{USER};
 
+# declare these to avoid warnings
+my $ENTITY;
+my $ENTITYNAME;
+my $HTTPDIR;
+my $BUILDERADMIN;
+my $TEAMEMAIL;
+my $IAM;
+
 open CONFIG, "<etc/config" or die;
 while (<CONFIG>) {
 	eval "\$$1=$2; return (1);" if ( /^\s*(\w+)=(('|")(.+?)('|"))\s*$/ ) ;

Modified: people/goneri/update-pkg-games/update_pkg.sh
===================================================================
--- people/goneri/update-pkg-games/update_pkg.sh	2007-03-09 16:36:54 UTC (rev 2495)
+++ people/goneri/update-pkg-games/update_pkg.sh	2007-03-09 16:37:36 UTC (rev 2496)
@@ -52,7 +52,7 @@
 # write a list of the packages build from this source
 #$SVNBUILDPACKAGE --svn-dont-clean --svn-override=buildArea=$HTTPRESULT/$pkgname --svn-override=origDir=http://pkg-games.alioth.debian.org/tarballs --svn-builder "$PDEBUILD --buildresult $HTTPRESULT/$pkgname --configfile $PBUILDERRC" >> $LOG 2>&1
 $SVNBUILDPACKAGE --svn-override=buildArea=$HTTPRESULT/$pkgname $BUILDEREXTRAPARAMS --svn-builder "$PDEBUILD --use-pdebuild-internal --buildresult $HTTPRESULT/$pkgname" >> $LOG 2>&1
-# purge of the builddir
+# purge of the builddir - this fails if sudo is used :-/
 find $HTTPRESULT/$pkgname -mindepth 1 -type d -exec rm -rf {} \;
 # purge of the previous packages
 find $HTTPRESULT/$pkgname -type f ! -ctime 0 -exec rm -f {} \;
@@ -64,7 +64,7 @@
 if [ $(find $HTTPRESULT/$pkgname -cnewer $HTTPLOG/$pkgname/building-stamp -name '*.deb'| wc -l) -eq "0" ] ;
 then
 	touch "$HTTPLOG/$pkgname/failed-stamp"
-	rm -f $HTTPLOG/$pkgname/lintian.log $HTTPLOG/$pkgname/linda.log $HTTPLOG/$pkgname/pkg-games-policy.log
+	rm -f $HTTPLOG/$pkgname/lintian.log $HTTPLOG/$pkgname/linda.log $HTTPLOG/$pkgname/$ENTITY-policy.log
 	echo "-> failed" >> $HTTPLOG/$pkgname/build.log
 	rm -f $HTTPRESULT/$pkgname/changelog $HTTPRESULT/$pkgname/README.Debian $HTTPRESULT/$pkgname/control
 else
@@ -72,9 +72,9 @@
 	echo "-> success" >> $HTTPLOG/$pkgname/build.log
 	lintian $HTTPRESULT/$pkgname/*.deb $HTTPRESULT/$pkgname/*.dsc |grep -v UNRELEASE > $HTTPLOG/$pkgname/lintian.log
 	linda $HTTPRESULT/$pkgname/*.deb $HTTPRESULT/$pkgname/*.dsc |grep -v UNRELEASED|grep -v specified > $HTTPLOG/$pkgname/linda.log
-	rm -f $HTTPLOG/$pkgname/pkg-games-policy.log
+	rm -f $HTTPLOG/$pkgname/$ENTITY-policy.log
 	cp -f debian/changelog debian/README.Debian debian/control $HTTPRESULT/$pkgname
-	for script in `ls $CHECKSDIR`; do $CHECKSDIR/$script $HTTPRESULT/$pkgname/*.deb >> $HTTPLOG/$pkgname/pkg-games-policy.log ; done
+	for script in `ls $CHECKSDIR`; do $CHECKSDIR/$script $HTTPRESULT/$pkgname/*.deb >> $HTTPLOG/$pkgname/$ENTITY-policy.log ; done
 	echo "These package is an unofficial build from $ENTITYNAME's SVN." > $HTTPRESULT/$pkgname/README
 	echo " if you have any questions, contact: $BUIDERADMIN" >> $HTTPRESULT/$pkgname/README
 fi