From 780a2bb9055bb755aa7d415f69c21bc57237ba7b Mon Sep 17 00:00:00 2001 From: Mike McLean Date: Apr 21 2016 15:11:11 +0000 Subject: [PATCH 1/2] return buildinfo from cg_import --- diff --git a/hub/kojihub.py b/hub/kojihub.py index 7f0ede0..6622ea4 100644 --- a/hub/kojihub.py +++ b/hub/kojihub.py @@ -4697,7 +4697,7 @@ def cg_import(metadata, directory): """ importer = CG_Importer() - importer.do_import(metadata, directory) + return importer.do_import(metadata, directory) class CG_Importer(object): @@ -4738,6 +4738,8 @@ class CG_Importer(object): koji.plugin.run_callbacks('postImport', type='cg', metadata=metadata, directory=directory, buildinfo=self.buildinfo) + return self.buildinfo + def get_metadata(self, metadata, directory): """Get the metadata from the args""" From 498714a2ccdccb9df8c37c1d8afce40a79d43863 Mon Sep 17 00:00:00 2001 From: Mike McLean Date: Apr 21 2016 15:59:34 +0000 Subject: [PATCH 2/2] honor --test in import-cg command --- diff --git a/cli/koji b/cli/koji index 1cb26cb..4eb7697 100755 --- a/cli/koji +++ b/cli/koji @@ -1622,6 +1622,9 @@ def handle_import_cg(options, session, args): parser.error(_("No such file: %s") % localpath) to_upload.append([localpath, info]) + if options.test: + return + # get upload path # XXX - need a better way serverdir = _unique_path('cli-import')