now commit symlinks in apps dir instead of generating them in bootstr…

…ap.py

.gitignore

@@ -11,4 +11,3 @@
 /settings.py
 /sourceme.sh
 /gigapan
-/apps

apps/geocamAware

@@ -0,0 +1 @@
+../submodules/geocamAwareWeb/geocamAware

apps/geocamCore

@@ -0,0 +1 @@
+../submodules/geocamCoreWeb/geocamCore

apps/geocamFolder

@@ -0,0 +1 @@
+../submodules/geocamFolderWeb/geocamFolder

apps/geocamLens

@@ -0,0 +1 @@
+../submodules/geocamLensWeb/geocamLens

apps/geocamMemo

@@ -0,0 +1 @@
+../submodules/geocamMemoWeb/geocamMemo

apps/geocamTalk

@@ -0,0 +1 @@
+../submodules/geocamMemoWeb/geocamTalk

apps/geocamTrack

@@ -0,0 +1 @@
+../submodules/geocamTrackWeb/geocamTrack

apps/geocamUtil

@@ -0,0 +1 @@
+../submodules/geocamUtilWeb/geocamUtil

management/bootstrap.py

@@ -41,9 +41,9 @@
            dict(name='gitSubmodulesMasterBranch',
                 desc='Set submodules to be on their master branch for development',
                 confirm=True),
-           dict(name='linkSubmodules',
-                desc='Link submodules into apps directory',
-                confirm=True),
+           #dict(name='linkSubmodules',
+           #     desc='Link submodules into apps directory',
+           #     confirm=True),
            dict(name='installSubModuleRequirements',
                 desc='Install Python modules listed in the requirements for each submodule',
                 confirm=True),
@@ -86,27 +86,27 @@ def dosys(cmd, continueOnError=False):
     ret = os.system(cmd)
     if ret != 0:
         if continueOnError:
-            logging.warning('WARNING: Command returned non-zero return value %d', ret)
+            logging.warning('WARNING: Command returned non-zero return value %d' % ret)
         else:
-            logging.error('ERROR: Command returned non-zero return value %d', ret)
+            logging.error('ERROR: Command returned non-zero return value %d' % ret)
             sys.exit(1)
 
 
 def writeFileMakeDir(path, text):
-    d = os.path.dirname(path)
-    if not os.path.exists(d):
-        os.makedirs(d)
+    dir = os.path.dirname(path)
+    if not os.path.exists(dir):
+        os.makedirs(dir)
     f = file(path, 'w')
     f.write(text + '\n')
     f.close()
 
 
 def fillTemplate(inputFile, outputFile, context):
     if os.path.exists(outputFile):
-        logging.warning('WARNING: File %s exists, not overwriting. Move current version out of the way to regenerate', outputFile)
+        logging.warning('WARNING: File %s exists, not overwriting. Move current version out of the way to regenerate' % outputFile)
         return
 
-    logging.info('generating %s', outputFile)
+    logging.info('generating %s' % outputFile)
 
     from django.template import Template, Context
     from django.conf import settings
@@ -140,9 +140,9 @@ def linkSubmodules(opts):
         relativeSrc = '../%s' % src
         dst = 'apps/%s' % appName
         if os.path.lexists(dst):
-            logging.debug('  %s -> %s skipped (already exists)', dst, relativeSrc)
+            logging.debug('  %s -> %s skipped (already exists)' % (dst, relativeSrc))
         else:
-            logging.debug('  %s -> %s', dst, relativeSrc)
+            logging.debug('  %s -> %s' % (dst, relativeSrc))
             os.symlink(relativeSrc, dst)
 
 
@@ -154,15 +154,15 @@ def hasRequirements(reqsFile):
 
 
 def installRequirements(reqsFile):
-    needSudo = 'VIRTUALENV' not in os.environ
+    needSudo = 'VIRTUAL_ENV' not in os.environ
     if needSudo:
         sudoStr = 'sudo '
     else:
         sudoStr = ''
     if hasRequirements(reqsFile):
         dosys('%spip install -r %s' % (sudoStr, reqsFile))
     else:
-        logging.info('requirements file %s is empty', reqsFile)
+        logging.info('requirements file %s is empty' % reqsFile)
 
 
 def installSubModuleRequirements(opts):
@@ -192,7 +192,7 @@ def needSettings(opts):
 
 
 def genSettings(opts):
-    secretKey = ''.join([choice('abcdefghijklmnopqrstuvwxyz0123456789!@#$%^&*(-_=+)') for _ in range(50)])
+    secretKey = ''.join([choice('abcdefghijklmnopqrstuvwxyz0123456789!@#$%^&*(-_=+)') for i in range(50)])
 
     fillTemplate('management/templates/%s' % SETTINGS_NAME,
                  SETTINGS_NAME,
@@ -229,9 +229,9 @@ def doAction(opts, action):
 
     if status != 'NEEDED':
         if opts.retry:
-            logging.info('Would skip %s, status is %s, but running in retry mode', action['name'], status)
+            logging.info('Would skip %s, status is %s, but running in retry mode' % (action['name'], status))
         else:
-            logging.info('Skipping step %s, status is %s', action['name'], status)
+            logging.info('Skipping step %s, status is %s' % (action['name'], status))
             return
 
     # confirm with user
@@ -260,16 +260,14 @@ def doit(opts, args):
     if args:
         for arg in args:
             if arg not in ACTION_DICT:
-                print >> sys.stderr, 'ERROR: there is no action %s' % arg
-                # suppress bogus pylint warning about redefining name 'a' from outer scope
-                # pylint: disable=W0621
-                print >> sys.stderr, 'Available actions are: %s' % (' '.join([a['name'] for a in ACTIONS]))
+                print >>sys.stderr, 'ERROR: there is no action %s' % arg
+                print >>sys.stderr, 'Available actions are: %s' % (' '.join([a['name'] for a in ACTIONS]))
                 sys.exit(1)
         actions = [ACTION_DICT[arg] for arg in args]
     else:
         actions = ACTIONS
 
-    logging.info('Working in %s', os.getcwd())
+    logging.info('Working in %s' % os.getcwd())
     for action in actions:
         doAction(opts, action)