diff options
author | Guido Günther <agx@sigxcpu.org> | 2008-10-31 09:59:30 +0100 |
---|---|---|
committer | Guido Guenther <agx@sigxcpu.org> | 2008-10-31 10:02:21 +0100 |
commit | c410c0be509ad9d68814f6c72a50209ecd5f2f11 (patch) | |
tree | bb83681c567ad39d95843aa28da9a859ea76521d /git-import-orig | |
parent | d4d45805c859bc530ed16f84079b21a57bfd0c03 (diff) |
switch back to original branch on empty imports
Closes: #504029, #504072
Diffstat (limited to 'git-import-orig')
-rwxr-xr-x | git-import-orig | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/git-import-orig b/git-import-orig index 1691426f..95ea1b5d 100755 --- a/git-import-orig +++ b/git-import-orig @@ -28,7 +28,7 @@ import gbp.command_wrappers as gbpc from gbp.deb_utils import parse_changelog, unpack_orig, NoChangelogError, has_epoch, tar_toplevel from gbp.git_utils import (GitRepositoryError, GitRepository, build_tag) from gbp.config import GbpOptionParser -from gbp.errors import GbpError +from gbp.errors import (GbpError, GbpNothingImported) def cleanup_tmp_tree(tree): @@ -65,7 +65,7 @@ def import_upstream_tree(repo, src_dir, version, filters, verbose): if repo.replace_tree(src_dir, filters, verbose=True): gbpc.GitCommitAll(verbose=verbose)(msg="Imported Upstream version %s" % version) else: - raise GbpError, "Nothing to commit, nothing imported." + raise GbpNothingImported except gbpc.CommandExecFailed: raise GbpError, "Import of upstream version %s failed." % version @@ -139,7 +139,8 @@ def main(argv): raise GbpError, "%s is not a git repository" % (os.path.abspath('.')) # an empty repo has now branches: - if repo.get_branch(): + initial_branch = repo.get_branch() + if initial_branch: is_empty = False else: is_empty = True @@ -220,6 +221,10 @@ on howto create it otherwise use --upstream-branch to specify it. gbpc.Dch("%s%s-1" % (epoch, version), 'New Upstream Version')() except gbpc.CommandExecFailed: raise GbpError, "Import of %s failed" % archive + except GbpNothingImported, err: + print >>sys.stderr, err + repo.set_branch(initial_branch) + ret = 1 except GbpError, err: if len(err.__str__()): print >>sys.stderr, err |