Merge lp:~cjohnston/ubuntu-ci-services-itself/cli-sp-name-prop into lp:ubuntu-ci-services-itself

[Chris Johnston]

Switch the CLI to use the source_package_name property

[Ursula Junque (ursinha)]

It was using the ChangesProcessor.sourcepackage attribute before, the difference I see now is where it's set. I'm fine with the change.

review: Approve

[Chris Johnston (cjohnston)]

 merge approved

review: Approve

=== modified file 'cli/ci_libs/file_handler.py'
--- cli/ci_libs/file_handler.py	2014-01-15 14:16:20 +0000
+++ cli/ci_libs/file_handler.py	2014-01-17 03:00:28 +0000
@@ -62,7 +62,6 @@
         else:
             self.files_to_upload_dir = os.path.dirname(changes_filepath)
         self.files_to_upload = []
-        self.sourcepackage = ''
         self.changes = None
 
     @property
@@ -94,14 +93,13 @@
                 else:
                     raise FileToUploadNotFound(file_)
             self.files_to_upload.append(self.changes.get_changes_file())
-            self.sourcepackage = self.changes.get_package_name()
         except Exception, exc:
             raise exc
 
     def process(self, check_signature=False):
         self.parse()
         self.validate(check_signature=check_signature)
-        return self.files_to_upload, self.sourcepackage
+        return self.files_to_upload
 
 
 def upload_files(file_path, ticket_id):

=== modified file 'cli/ci_libs/ticket.py'
--- cli/ci_libs/ticket.py	2014-01-15 14:16:20 +0000
+++ cli/ci_libs/ticket.py	2014-01-17 03:00:28 +0000
@@ -41,7 +41,8 @@
         changes = ChangesProcessor(
             changes_filepath=changes_filepath,
             files_to_upload_dir=args.files_to_upload_dir)
-        self.files, self.sourcepackage = changes.process()
+        self.files = changes.process()
+        self.sourcepackage = changes.source_package_name
 
     def _process(self, args):
         self._create_spu(args)