← Back to branch summary

~umang/quickly/587538-no-changelog

« back to all changes in this revision

Viewing changes to data/templates/ubuntu-application/configure.py

  • Committer: Didier Roche
  • Date: 2010-06-11 11:13:21 UTC
  • mfrom: (509.1.1 better-dep-detection)
  • Revision ID: didrocks@ubuntu.com-20100611111321-e5enzjb11z0u3w3f
  - fix not all syntax for dependencies supported (LP: #587520) (Frederik
    Elwert)

Show diffs side-by-side

added added

removed removed

Lines of Context:
data/templates/ubuntu-application/configure.py
19
19
import os
20
20
import sys
21
21
import tempfile
 
22
import subprocess
22
23
 
23
24
import internal.apportutils
24
25
 
143
144
    if not configurationhandler.project_config:
144
145
        configurationhandler.loadConfig()
145
146
    try:
146
 
        dependencies = [elem for elem in configurationhandler.project_config['dependencies'].split(' ') if elem]
 
147
        dependencies = [elem.strip() for elem in configurationhandler.project_config['dependencies'].split(',') if elem]
147
148
    except KeyError:
148
149
        dependencies = []
149
150
    depfile_name = tempfile.mkstemp()[1]
152
153
    dependencies = []
153
154
    os.system("%s %s" % (editor, depfile_name))
154
155
    for depends in file(depfile_name, 'r'):
155
 
        dependencies.extend([elem for elem in depends[:-1].split(' ') if elem])
 
156
        dependencies.extend([elem.strip() for elem in depends.split(',') if elem])
156
157
    os.remove(depfile_name)
157
 
    configurationhandler.project_config['dependencies'] = " ".join(dependencies)
 
158
    configurationhandler.project_config['dependencies'] = ", ".join(dependencies)
158
159
    configurationhandler.saveConfig()
159
160