buildpackage-rpm: handle invalid keys in orig prefix

Gracefully handle invalid keys in the --git-orig-prefix format string.

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>

diff --git a/gbp/scripts/buildpackage_rpm.py b/gbp/scripts/buildpackage_rpm.py
index be938aaeef009d0ae280189eb40291def3f72706..efc344d6f74c763d0f93235c0e7b16932f4c7aa5 100755 (executable)
--- a/gbp/scripts/buildpackage_rpm.py
+++ b/gbp/scripts/buildpackage_rpm.py
@@ -599,10 +599,13 @@ def main(argv):
             spec.specdir = os.path.abspath(spec_dir)
 
             if options.orig_prefix != 'auto':
-                options.orig_prefix = options.orig_prefix % dict(spec.version,
-                                                                 version=RpmPkgPolicy.compose_full_version(spec.version),
-                                                                 name=spec.name,
-                                                                 vendor=options.vendor)
+                try:
+                    options.orig_prefix %= dict(spec.version,
+                        version=RpmPkgPolicy.compose_full_version(spec.version),
+                        name=spec.name, vendor=options.vendor)
+                except KeyError as err:
+                    raise GbpError("Unknown key %s in orig prefix format "
+                                   "string" % err)
             elif spec.orig_src:
                 options.orig_prefix = spec.orig_src['prefix']