diff options
Diffstat (limited to 'gbp/scripts/import_srpm.py')
| -rwxr-xr-x | gbp/scripts/import_srpm.py | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/gbp/scripts/import_srpm.py b/gbp/scripts/import_srpm.py index 5013ba60..c4b3a488 100755 --- a/gbp/scripts/import_srpm.py +++ b/gbp/scripts/import_srpm.py @@ -17,7 +17,6 @@ # <http://www.gnu.org/licenses/> """Import an RPM source package into a Git repository""" -from six.moves import configparser import sys import re import os @@ -37,6 +36,7 @@ from gbp.git.modifier import GitModifier from gbp.config import (GbpOptionParserRpm, GbpOptionGroup, no_upstream_branch_msg) from gbp.errors import GbpError +from gbp.scripts.common import ExitCodes import gbp.log from gbp.pkg import parse_archive_filename @@ -123,7 +123,7 @@ def build_parser(name): prefix='', usage='%prog [options] /path/to/package' '.src.rpm') - except configparser.ParsingError as err: + except GbpError as err: gbp.log.err(err) return None @@ -205,6 +205,8 @@ def main(argv): skipped = False options, args = parse_args(argv) + if not options: + return ExitCodes.parse_error if len(args) != 1: gbp.log.err("Need to give exactly one package to import. Try --help.") @@ -356,7 +358,7 @@ def main(argv): src_vendor = "Native" if options.native else "Upstream" msg = "%s version %s" % (src_vendor, spec.upstreamversion) src_commit = repo.commit_dir(sources.unpacked, - "Imported %s" % msg, + "Import %s" % msg, branch, author=author, committer=committer, @@ -399,7 +401,7 @@ def main(argv): if options.orphan_packaging or not sources: commit = repo.commit_dir(dirs['packaging_base'], - "Imported %s" % msg, + "Import %s" % msg, branch, author=author, committer=committer, @@ -417,7 +419,7 @@ def main(argv): shutil.copy2(os.path.join(dirs['packaging'], fname), pkgsubdir) commit = repo.commit_dir(sources.unpacked, - "Imported %s" % msg, + "Import %s" % msg, branch, other_parents=[src_commit], author=author, @@ -461,6 +463,7 @@ def main(argv): gbp.log.info("Version '%s' imported under '%s'" % (ver_str, spec.name)) return ret + if __name__ == '__main__': sys.exit(main(sys.argv)) |