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: not available
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 Approve
Review via email: mp+10408@code.staging.launchpad.net
To post a comment you must log in.
Revision history for this message
mac9416 (mac9416) wrote :

Fixed newline characters in keryx.conf. Made CLI project creation default to debian plugin, ignoring plugin argument

Revision history for this message
Chris Oliver (excid3) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'keryx.conf' (properties changed: +x to -x)
--- keryx.conf 2009-08-16 01:38:01 +0000
+++ keryx.conf 2009-08-19 12:59:11 +0000
@@ -1,7 +1,7 @@
1LogDir=../logs1LogDir=../logs
2PluginsDir=../plugins2PluginsDir=../plugins
3ProjectsDir=../projects3ProjectsDir=../projects
4PixmapsDir=../pixmaps4PixmapsDir=../pixmaps
5ThemesDir=../pixmaps/themes5ThemesDir=../pixmaps/themes
6DefaultTheme=../pixmaps/themes/default6DefaultTheme=../pixmaps/themes/default
7CurrentTheme=../pixmaps/themes/default7CurrentTheme=../pixmaps/themes/default
88
=== modified file 'keryx.py' (properties changed: +x to -x)
--- keryx.py 2009-02-07 03:51:20 +0000
+++ keryx.py 2009-08-19 12:59:11 +0000
@@ -71,13 +71,13 @@
71if ('--create' in sys.argv):71if ('--create' in sys.argv):
72 import platform72 import platform
73 from lib import plugins, project73 from lib import plugins, project
74 try:74# try:
75 index = sys.argv.index('--create')75 index = sys.argv.index('--create')
76 name = sys.argv[index + 1]76 name = sys.argv[index + 1]
77 plugin_name = sys.argv[index + 2].lower()77 plugin_name = 'debian'
78 except:78# except:
79 log.error(_('Unable to create project'))79# log.error(_('Unable to create project'))
80 sys.exit(1)80# sys.exit(1)
81 plugins.load(consts.dirPlugins, '', False) # Don't load interface plugins81 plugins.load(consts.dirPlugins, '', False) # Don't load interface plugins
82 for item in range(0,len(plugins.OSPluginList)):82 for item in range(0,len(plugins.OSPluginList)):
83 if plugin_name == plugins.OSPluginList[item][0].lower():83 if plugin_name == plugins.OSPluginList[item][0].lower():

Subscribers

People subscribed via source and target branches