import-dsc: Bail out if target dir exists

If import-dsc is not run from within a Git repository it tries to create
one named like the souce package. If that directory already exists we
get confusing message like:

    gbp:info: No git repository found, creating one.
    gbp:warning: Version 0.7.0 already imported.
    gbp:info: Everything imported under /foo/git-buildpackage

Avoid this by checking if the directory exists and aborting in this
case.

Closes: #766350

1 files changed, 4 insertions, 1 deletions

diff --git a/gbp/scripts/import_dsc.py b/gbp/scripts/import_dsc.py
index 6c9530c3..bc93bb8d 100644
--- a/gbp/scripts/import_dsc.py
+++ b/gbp/scripts/import_dsc.py
@@ -316,13 +316,16 @@ def main(argv):
                 if not clean and not is_empty:
                     gbp.log.err("Repository has uncommitted changes, commit these first: ")
                     raise GbpError(out)
-
             except GitRepositoryError:
                 # no repo found, create one
                 needs_repo = True
                 is_empty = True
 
             if needs_repo:
+                if os.path.exists(src.pkg):
+                    raise GbpError("Directory '%s' already exists. If you want to import into it, "
+                                   "please change into this directory otherwise move it away first."
+                                   % src.pkg)
                 gbp.log.info("No git repository found, creating one.")
                 repo = DebianGitRepository.create(src.pkg)
                 os.chdir(repo.path)