Merge lp:~mterry/quickly/open-bin-project-name into lp:quickly

Proposed by Michael Terry
Status: Merged
Approved by: Didier Roche-Tolomelli
Approved revision: 616
Merged at revision: 616
Proposed branch: lp:~mterry/quickly/open-bin-project-name
Merge into: lp:quickly
Diff against target: 17 lines (+5/-2)
1 file modified
data/templates/ubuntu-application/edit.py (+5/-2)
To merge this branch: bzr merge lp:~mterry/quickly/open-bin-project-name
Reviewer Review Type Date Requested Status
Didier Roche-Tolomelli Approve
Review via email: mp+59237@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Didier Roche-Tolomelli (didrocks) wrote :

Nice work :-)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/templates/ubuntu-application/edit.py'
2--- data/templates/ubuntu-application/edit.py 2011-02-24 02:14:23 +0000
3+++ data/templates/ubuntu-application/edit.py 2011-04-27 15:05:54 +0000
4@@ -56,8 +56,11 @@
5 if not configurationhandler.project_config:
6 configurationhandler.loadConfig()
7
8-# add launcher which does not end with .py
9-# filelist.append('bin/' + configurationhandler.project_config['project'])
10+# add launcher which does not end with .py for older projects (pre-lib split)
11+project_name = configurationhandler.project_config['project']
12+libdir = os.path.join(templatetools.python_name(project_name) + '_lib')
13+if not os.path.exists(libdir):
14+ filelist.append('bin/' + configurationhandler.project_config['project'])
15
16 # add helpfile sources
17 filelist.extend(glob.glob('help/C/*.page'))

Subscribers

People subscribed via source and target branches