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
1=== modified file 'keryx.conf' (properties changed: +x to -x)
2--- keryx.conf 2009-08-16 01:38:01 +0000
3+++ keryx.conf 2009-08-19 12:59:11 +0000
4@@ -1,7 +1,7 @@
5-LogDir=../logs
6-PluginsDir=../plugins
7-ProjectsDir=../projects
8-PixmapsDir=../pixmaps
9-ThemesDir=../pixmaps/themes
10-DefaultTheme=../pixmaps/themes/default
11-CurrentTheme=../pixmaps/themes/default
12+LogDir=../logs
13+PluginsDir=../plugins
14+ProjectsDir=../projects
15+PixmapsDir=../pixmaps
16+ThemesDir=../pixmaps/themes
17+DefaultTheme=../pixmaps/themes/default
18+CurrentTheme=../pixmaps/themes/default
19
20=== modified file 'keryx.py' (properties changed: +x to -x)
21--- keryx.py 2009-02-07 03:51:20 +0000
22+++ keryx.py 2009-08-19 12:59:11 +0000
23@@ -71,13 +71,13 @@
24 if ('--create' in sys.argv):
25 import platform
26 from lib import plugins, project
27- try:
28- index = sys.argv.index('--create')
29- name = sys.argv[index + 1]
30- plugin_name = sys.argv[index + 2].lower()
31- except:
32- log.error(_('Unable to create project'))
33- sys.exit(1)
34+# try:
35+ index = sys.argv.index('--create')
36+ name = sys.argv[index + 1]
37+ plugin_name = 'debian'
38+# except:
39+# log.error(_('Unable to create project'))
40+# sys.exit(1)
41 plugins.load(consts.dirPlugins, '', False) # Don't load interface plugins
42 for item in range(0,len(plugins.OSPluginList)):
43 if plugin_name == plugins.OSPluginList[item][0].lower():

Subscribers

People subscribed via source and target branches