keryx team mailing list archive

[mac9416 <mac9416@xxxxxxxxxxxxxxxx>]

mac9416 has proposed merging lp:~mac9416/keryx/trunk into lp:keryx.

Requested reviews:
    Keryx Admins (keryx-admins)

 * Returned keryx.py to where it prints 'unable to create project' instead of traceback output
 * Moved keryx.conf to doc/
-- 
https://code.launchpad.net/~mac9416/keryx/trunk/+merge/10437
Your team Keryx Development Team is subscribed to branch lp:keryx.

=== renamed file 'keryx.conf' => 'doc/keryx.conf'
=== modified file 'keryx.py'
--- keryx.py	2009-08-19 12:59:11 +0000
+++ keryx.py	2009-08-20 01:59:39 +0000
@@ -71,13 +71,13 @@
 if ('--create' in sys.argv):
     import platform
     from lib import plugins, project
-#    try:
-    index = sys.argv.index('--create')
-    name = sys.argv[index + 1]
-    plugin_name = 'debian'
-#    except:
-#        log.error(_('Unable to create project'))
-#        sys.exit(1)
+    try:
+        index = sys.argv.index('--create')
+        name = sys.argv[index + 1]
+        plugin_name = 'debian'
+    except:
+        log.error(_('Unable to create project'))
+        sys.exit(1)
     plugins.load(consts.dirPlugins, '', False) # Don't load interface plugins
     for item in range(0,len(plugins.OSPluginList)):
         if plugin_name == plugins.OSPluginList[item][0].lower():

=== modified file 'setup.py'
--- setup.py	2009-08-16 02:38:22 +0000
+++ setup.py	2009-08-20 02:19:49 +0000
@@ -139,8 +139,8 @@
         shutil.copytree('projects', os.path.join(os.path.join(binDir, ver), 'projects'))
         
         # Copy conf
-        shutil.copy('keryx.conf', linDir)
-        shutil.copy('keryx.conf', os.path.join(os.path.join(binDir, ver), winDir))
+        shutil.copy(os.path.join('doc', 'keryx.conf'), linDir)
+        shutil.copy(os.path.join('doc', 'keryx.conf'), os.path.join(os.path.join(binDir, ver), winDir))
 
         # Build release zip
         zipdir(binDir, '%s.zip' % ver)