← Back to branch summary

~sylvain-pineau/checkbox/fix-1578579

« back to all changes in this revision

Viewing changes to checkbox-ng/launchers/checkbox-cli

  • Committer: Sylvain Pineau
  • Author(s): Launchpad Translations on behalf of checkbox-dev, Maciej Kisielewski, Sylvain Pineau
  • Date: 2016-04-29 07:31:49 UTC
  • mfrom: (4321.1.5 launchpad/absolute-configs)
  • Revision ID: sylvain_pineau-20160429073149-olwtgsmo8idztmrz
"automatic merge of lp:~kissiel/checkbox/absolute-configs/ by tarmac [r=sylvain-pineau][bug=][author=kissiel]"

Show diffs side-by-side

added added

removed removed

Lines of Context:
checkbox-ng/launchers/checkbox-cli
114
114
                raise SystemExit(1)
115
115
            generic_launcher = LauncherDefinition()
116
116
            generic_launcher.read_string(text)
117
 
            config_filename = generic_launcher.config_filename
 
117
            config_filename = os.path.expandvars(
 
118
                generic_launcher.config_filename)
 
119
            if not os.path.split(config_filename)[0]:
 
120
                configs = [
 
121
                    '/etc/xdg/{}'.format(config_filename),
 
122
                    os.path.expanduser('~/.config/{}'.format(config_filename))]
 
123
            else:
 
124
                configs = [config_filename]
118
125
            launcher = generic_launcher.get_concrete_launcher()
119
 
        configs = [
120
 
            '/etc/xdg/{}'.format(config_filename),
121
 
            os.path.expanduser('~/.config/{}'.format(config_filename))]
122
126
        if context.args.launcher:
123
127
            configs.append(context.args.launcher)
124
128
        launcher.read(configs)