Catched GitRepositoryError to avoid crashes 'Currently not on a

branch' and similar. Fixes #85

Change-Id: Icc125010b0bf2c2a89392f97502171f4d4dff125

diff --git a/gitbuildsys/cmd_build.py b/gitbuildsys/cmd_build.py
index 95b3611..52274c1 100644 (file)
--- a/gitbuildsys/cmd_build.py
+++ b/gitbuildsys/cmd_build.py
@@ -383,7 +383,7 @@ def do(opts, args):
             if not git_archive(repo, spec, "%s/packaging" % workdir, 'HEAD',
                                comp_type, comp_level=9, with_submodules=True):
                 msger.error("Cannot create source tarball %s" % tarball)
-        except GbpError, exc:
+        except (GbpError, GitRepositoryError), exc:
             msger.error(str(exc))
 
     if opts.incremental:

diff --git a/gitbuildsys/cmd_export.py b/gitbuildsys/cmd_export.py
index fc7019f..2e64129 100644 (file)
--- a/gitbuildsys/cmd_export.py
+++ b/gitbuildsys/cmd_export.py
@@ -102,5 +102,5 @@ def do(opts, args):
         if not git_archive(repo, spec, outdir, 'HEAD',
                            comp_type, comp_level=9, with_submodules=True):
             msger.error("Cannot create source tarball %s" % tarball)
-    except GbpError, exc:
+    except (GbpError, GitRepositoryError), exc:
         msger.error(str(exc))