Autotest upstream merge.

Merged from d9d64b855363d214996b187380532d4cc9991d29 to
7bad38846fe9c74e42018131ce85aec2b5e6c7a9

BUG=none
TEST=emerge autotest, run bvt, smoke.

Change-Id: Ibe6462198e84e0d41fa160af086283cd712da4a6
Reviewed-on: http://gerrit.chromium.org/gerrit/7440
Tested-by: Dale Curtis <dalecurtis@chromium.org>
Reviewed-by: Dale Curtis <dalecurtis@chromium.org>
diff --git a/cli/job.py b/cli/job.py
index df5d3b8..51ceb92 100644
--- a/cli/job.py
+++ b/cli/job.py
@@ -314,10 +314,11 @@
                 [host_info, job_info, oth_info, label_info] + parse_info,
                 req_items='jobname')
         self.data = {}
-        if len(self.jobname) > 1:
+        jobname = getattr(self, 'jobname')
+        if len(jobname) > 1:
             self.invalid_syntax('Too many arguments specified, only expected '
-                                'to receive job name: %s' % self.jobname)
-        self.jobname = self.jobname[0]
+                                'to receive job name: %s' % jobname)
+        self.jobname = jobname[0]
 
         if options.priority:
             self.data['priority'] = options.priority.capitalize()