[Blends-commit] [SCM] website branch, master, updated. a8d8c879b568b73f45559df2ba28ba4213ee7e34

[Andreas Tille]

The following commit has been merged in the master branch:
commit a8d8c879b568b73f45559df2ba28ba4213ee7e34
Author: Andreas Tille <tille at debian.org>
Date:   Wed May 6 09:42:16 2015 +0200

    Fix SVN update command

diff --git a/webtools/blendstasktools.py b/webtools/blendstasktools.py
index 6b3a0bb..b914bf8 100644
--- a/webtools/blendstasktools.py
+++ b/webtools/blendstasktools.py
@@ -601,12 +601,12 @@ def FetchTasksFiles(data):
                     os.makedirs(tasksdir)
                 except:
                     logger.error("Unable to create data directory", tasksdir)
-    	    svncommand = "svn %%s %s/%s %s >> /dev/null" % (data['vcsdir'], dir, tasksdir)
+    	    svncommand = "svn %%s %%s %s >> /dev/null" % ( tasksdir)
     	    if os.path.isdir(tasksdir+'/.svn'):
-    	        svncommand = svncommand % ' --accept theirs-conflict up'
+    	        svncommand = svncommand % (' --accept theirs-conflict up', '')
             else:
                 os.system("mkdir -p %s" % (tasksdir))
-                svncommand = svncommand % 'co'
+                svncommand = svncommand % ('co', data['vcsdir']+'/'+dir)
             if os.system(svncommand):
     	        logger.error("SVN command %s failed" % (svncommand))
     	        if os.path.isdir(tasksdir+'/.svn'):

-- 
Static and dynamic websites for Debian Pure Blends