Keryx

Merge lp://staging/keryx/unstable into lp://staging/keryx/stable

  1. unstable
  2. Merge into stable
Proposed by mac9416
Status: Merged
Merged at revision: 67
Proposed branch: lp://staging/keryx/unstable
Merge into: lp://staging/keryx/stable
Diff against target: None lines
To merge this branch: bzr merge lp://staging/keryx/unstable
Reviewer Review Type Date Requested Status
Chris Oliver Pending
Review via email: mp+10437@code.staging.launchpad.net
To post a comment you must log in.
Revision history for this message
mac9416 (mac9416) wrote :

 * Returned keryx.py to where it prints 'unable to create project' instead of traceback output
 * Moved keryx.conf to doc/

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== renamed file 'keryx.conf' => 'doc/keryx.conf'
2=== modified file 'keryx.py'
3--- keryx.py 2009-08-19 12:59:11 +0000
4+++ keryx.py 2009-08-20 01:59:39 +0000
5@@ -71,13 +71,13 @@
6 if ('--create' in sys.argv):
7 import platform
8 from lib import plugins, project
9-# try:
10- index = sys.argv.index('--create')
11- name = sys.argv[index + 1]
12- plugin_name = 'debian'
13-# except:
14-# log.error(_('Unable to create project'))
15-# sys.exit(1)
16+ try:
17+ index = sys.argv.index('--create')
18+ name = sys.argv[index + 1]
19+ plugin_name = 'debian'
20+ except:
21+ log.error(_('Unable to create project'))
22+ sys.exit(1)
23 plugins.load(consts.dirPlugins, '', False) # Don't load interface plugins
24 for item in range(0,len(plugins.OSPluginList)):
25 if plugin_name == plugins.OSPluginList[item][0].lower():
26
27=== modified file 'setup.py'
28--- setup.py 2009-08-16 02:38:22 +0000
29+++ setup.py 2009-08-20 02:19:49 +0000
30@@ -139,8 +139,8 @@
31 shutil.copytree('projects', os.path.join(os.path.join(binDir, ver), 'projects'))
32
33 # Copy conf
34- shutil.copy('keryx.conf', linDir)
35- shutil.copy('keryx.conf', os.path.join(os.path.join(binDir, ver), winDir))
36+ shutil.copy(os.path.join('doc', 'keryx.conf'), linDir)
37+ shutil.copy(os.path.join('doc', 'keryx.conf'), os.path.join(os.path.join(binDir, ver), winDir))
38
39 # Build release zip
40 zipdir(binDir, '%s.zip' % ver)

Subscribers

People subscribed via source and target branches