← Back to branch summary

~ara/checkbox/fix_861538

« back to all changes in this revision

Viewing changes to plugins/resource_info.py

  • Committer: Brendan Donegan
  • Date: 2011-09-23 07:36:00 UTC
  • Revision ID: brendan.donegan@canonical.com-20110923073600-jehwg31f17qd1ur0
Reverse cherrypicked the which requires change.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins/resource_info.py
34
34
    def prompt_job(self, interface, job):
35
35
        mask = []
36
36
        values = []
37
 
        failed_requirements = []
38
 
 
39
37
        for require in job.get("requires", []):
40
38
            new_values = self.resources.eval(require)
41
39
            mask.append(bool(new_values))
42
 
            if not bool(new_values):
43
 
                failed_requirements.append(require)
44
 
 
45
40
            if new_values is not None:
46
41
                values.extend(new_values)
47
42
 
50
45
 
51
46
        else:
52
47
            job["status"] = UNSUPPORTED
53
 
 
54
 
            data = "Job requirement%s not met:" % (
55
 
                's' if len(failed_requirements) > 1 else '')
56
 
            for failed_require in failed_requirements:
57
 
                data = data + " '" + failed_require + "'"
58
 
 
59
 
            job["data"] = data
 
48
            job["data"] = "Job requirements not met."
60
49
            self._manager.reactor.stop()
61
50
 
62
51
    def report_resource(self, resource):