r3435 - people/goneri/SvnBuildStat-WWW/script

[Gonéri Le Bouder]

Author: goneri-guest
Date: 2007-07-18 18:28:31 +0000 (Wed, 18 Jul 2007)
New Revision: 3435

Modified:
   people/goneri/SvnBuildStat-WWW/script/svnbuildstat_agent.pl
Log:
If the there is just a debian directory I assum it's a
mergeWithUpstream layout and I add the property (e.g: kde stuffs)


Modified: people/goneri/SvnBuildStat-WWW/script/svnbuildstat_agent.pl
===================================================================
--- people/goneri/SvnBuildStat-WWW/script/svnbuildstat_agent.pl	2007-07-18 17:40:40 UTC (rev 3434)
+++ people/goneri/SvnBuildStat-WWW/script/svnbuildstat_agent.pl	2007-07-18 18:28:31 UTC (rev 3435)
@@ -165,10 +165,16 @@
 
   if ($report{'download'} ne "nok") {
     $report{'stamp_build-start'} = time;
-    `cd $workplace ; svn-buildpackage --svn-builder "pdebuild --use-pdebuild-internal --configfile $ccachedir/ccache.cfg -- --buildplace $pbuilderplace --distribution $distro --basetgz $pbuilderplace/$distro.tar.gz" --svn-override=origDir=$tarballsplace --svn-override=buildArea=$buildarea --svn-noninteractive >$reportarea/build.log.tmp 2>&1`;
+
+# If the there is just a debian directory I assum it's a mergeWithUpstream layout and I add the property
+    if (!grep (!/^debian$/, `/bin/ls $workplace`)) {
+      `cd $workplace; svn propset mergeWithUpstream 1 debian`;
+    }
+
+    `cd $workplace ; svn-buildpackage --svn-ignore-new --svn-builder "pdebuild --use-pdebuild-internal --configfile $ccachedir/ccache.cfg -- --buildplace $pbuilderplace --distribution $distro --basetgz $pbuilderplace/$distro.tar.gz" --svn-override=origDir=$tarballsplace --svn-override=buildArea=$buildarea --svn-noninteractive >$reportarea/build.log.tmp 2>&1`;
     $report{'stamp_build-end'} = time;
 
-# To avoid breakage with tar
+# To avoid breakage with tar on the service side, I do some clean up in the logs
     open BUILDLOGTMP, "<$reportarea/build.log.tmp" or die;
     open BUILDLOG, ">$reportarea/build.log" or die;
     foreach (<BUILDLOGTMP>) {