From a11d279a8a86e9009c933ad46c5719c38254ceaf Mon Sep 17 00:00:00 2001
From: Frederic Massart <fred@moodle.com>
Date: Wed, 20 Feb 2013 11:33:43 +0800
Subject: [PATCH] Create does not fail on bad value of symlinkToData

---
 lib/workplace.py |  2 +-
 moodle-create.py | 80 ++++++++++++++++++++++++++++----------------------------
 2 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/lib/workplace.py b/lib/workplace.py
index 50c295d..8c4ceff 100644
--- a/lib/workplace.py
+++ b/lib/workplace.py
@@ -118,7 +118,7 @@ class Workplace(object):
             os.symlink(wwwDir, linkDir)
 
         # Symlink to dataDir in wwwDir
-        if C.get('symlinkToData'):
+        if type(C.get('symlinkToData')) == str:
             linkDataDir = os.path.join(wwwDir, C.get('symlinkToData'))
             if not os.path.isfile(linkDataDir) and not os.path.isdir(linkDataDir) and not os.path.islink(linkDataDir):
                 os.symlink(dataDir, linkDataDir)
diff --git a/moodle-create.py b/moodle-create.py
index dab60ee..e5d89d6 100755
--- a/moodle-create.py
+++ b/moodle-create.py
@@ -52,61 +52,61 @@ name = Wp.generateInstanceName(version, integration = args.integration, suffix =
 # Wording version
 versionNice = version
 if version == 'master':
-	versionNice = C.get('wording.master')
+    versionNice = C.get('wording.master')
 
 # Generating names
 if args.integration:
-	fullname = C.get('wording.integration') + ' ' + versionNice + ' ' + C.get('wording.%s' % engine)
+    fullname = C.get('wording.integration') + ' ' + versionNice + ' ' + C.get('wording.%s' % engine)
 else:
-	fullname = C.get('wording.stable') + ' ' + versionNice + ' ' + C.get('wording.%s' % engine)
+    fullname = C.get('wording.stable') + ' ' + versionNice + ' ' + C.get('wording.%s' % engine)
 
 # Append the suffix
 if args.suffix:
-	fullname += ' ' + args.suffix.replace('-', ' ').replace('_', ' ').title()
+    fullname += ' ' + args.suffix.replace('-', ' ').replace('_', ' ').title()
 
 # Create the instance
 debug('Creating instance %s...' % name)
 kwargs = {
-	'name': name,
-	'version': version,
-	'integration': args.integration,
-	'useCacheAsRemote': C.get('useCacheAsRemote')
+    'name': name,
+    'version': version,
+    'integration': args.integration,
+    'useCacheAsRemote': C.get('useCacheAsRemote')
 }
-try:
-	M = Wp.create(**kwargs)
-except Exception as e:
-	debug(e)
-	sys.exit(1)
+# try:
+M = Wp.create(**kwargs)
+# except Exception as e:
+# debug(e)
+# sys.exit(1)
 
 # Run the install script
 if args.install:
 
-	# Checking database
-	dbname = re.sub(r'[^a-zA-Z0-9]', '', name).lower()[:28]
-	db = DB(engine, C.get('db.%s' % engine))
-	dropDb = False
-	if db.dbexists(dbname):
-		debug('Database already exists (%s)' % dbname)
-		dropDb = yesOrNo('Do you want to remove it?')
-
-	# Install
-	kwargs = {
-		'engine': engine,
-		'dbname': dbname,
-		'dropDb': dropDb,
-		'fullname': fullname,
-		'dataDir': Wp.getPath(name, 'data')
-	}
-	M.install(**kwargs)
-
-	# Running scripts
-	if M.isInstalled() and type(args.run) == list:
-	    for script in args.run:
-	        debug('Running script \'%s\'' % (script))
-	        try:
-	            M.runScript(script)
-	        except Exception as e:
-	            debug('Error while running the script')
-	            debug(e)
+    # Checking database
+    dbname = re.sub(r'[^a-zA-Z0-9]', '', name).lower()[:28]
+    db = DB(engine, C.get('db.%s' % engine))
+    dropDb = False
+    if db.dbexists(dbname):
+        debug('Database already exists (%s)' % dbname)
+        dropDb = yesOrNo('Do you want to remove it?')
+
+    # Install
+    kwargs = {
+        'engine': engine,
+        'dbname': dbname,
+        'dropDb': dropDb,
+        'fullname': fullname,
+        'dataDir': Wp.getPath(name, 'data')
+    }
+    M.install(**kwargs)
+
+    # Running scripts
+    if M.isInstalled() and type(args.run) == list:
+        for script in args.run:
+            debug('Running script \'%s\'' % (script))
+            try:
+                M.runScript(script)
+            except Exception as e:
+                debug('Error while running the script')
+                debug(e)
 
 debug('Process complete!')
-- 
2.11.0