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

Andreas Tille tille at debian.org
Mon May 27 08:50:46 UTC 2013


The following commit has been merged in the master branch:
commit 351eda0477f93f86a9bff03abbb193ac1fa0c9bd
Author: Andreas Tille <tille at debian.org>
Date:   Mon May 27 10:53:24 2013 +0200

    Make sure the fallback for error output will not fail

diff --git a/webtools/blendstasktools.py b/webtools/blendstasktools.py
index dd0b81c..a493354 100644
--- a/webtools/blendstasktools.py
+++ b/webtools/blendstasktools.py
@@ -596,8 +596,8 @@ def FetchTasksFiles(data):
     	    if os.path.isdir(data['datadir']+'/.git'):
                 logger.error("Trying old files in %s ..." % data['datadir'])
     	    else:
-                if os.listdir(data['datadir']+'/'+dir):
-                    logger.warning("No .git directory found in %s but trying those random files there as tasks files." % data['datadir']+'/'+dir)
+                if os.listdir(data['datadir']):
+                    logger.warning("No .git directory found in %s but trying those random files there as tasks files." % data['datadir'])
                 else:
                     logger.error("There are no old files in %s -> giving up" % data['datadir'])
                     exit(-1)

-- 
Static and dynamic websites for Debian Pure Blends



More information about the Blends-commit mailing list