← Back to branch summary

~xubuntu-dev/ubuntu-cdimage/xubuntu-base

« back to all changes in this revision

Viewing changes to bin/rebuild-requests

  • Committer: Stéphane Graber
  • Date: 2015-08-18 23:21:39 UTC
  • Revision ID: stgraber@ubuntu.com-20150818232139-xv5kgtqhznawumjf
Fix rebuild-requests with ubuntu-touch

Show diffs side-by-side

added added

removed removed

Lines of Context:
bin/rebuild-requests
128
128
                      (entry[0].product_title, entry[0].series_title,
129
129
                       entry[0].requestedby_name, entry[1:]))
130
130
 
131
 
        env = dict(os.environ)
 
131
        env = {}
132
132
        if sub_project:
133
133
            env['SUBPROJECT'] = sub_project
 
134
 
 
135
        if project == "ubuntu-touch" and args[0] == "vivid":
 
136
            env['EXTRA_PPAS'] = \
 
137
                "ci-train-ppa-service/stable-phone-overlay:1001"
 
138
 
134
139
        env['ARCHES'] = arches
135
140
        env['DIST'] = entries[0][0].series_title.lower()
136
141
        cmd = ["for-project", project, "cron.%s" % entry[2]]
141
146
 
142
147
        if options.dry_run:
143
148
            if not options.quiet:
144
 
                if sub_project:
145
 
                    print("Dry-run: SUBPROJECT=%s ARCHES=%s DIST=%s %s" %
146
 
                          (env['SUBPROJECT'], env['ARCHES'], env['DIST'],
147
 
                           " ".join(cmd)))
148
 
                else:
149
 
                    print("Dry-run: ARCHES=%s DIST=%s %s" %
150
 
                          (env['ARCHES'], env['DIST'], " ".join(cmd)))
 
149
                env_str = ""
 
150
                for key, value in env.items():
 
151
                    env_str += "%s=\"%s\" " % (key, value)
 
152
                print("Dry-run: %s%s" % (env_str, " ".join(cmd)))
151
153
        else:
152
 
            processes.append(subprocess.Popen(cmd, env=env))
 
154
            exec_env = dict(os.environ)
 
155
            exec_env.update(env)
 
156
            processes.append(subprocess.Popen(cmd, env=exec_env))
153
157
        if not options.quiet:
154
158
            print("")
155
159