Skip to content

Commit

Permalink
Merge pull request #223 from ros-infrastructure/issue_222
Browse files Browse the repository at this point in the history
check for git repo before checking for submodules
  • Loading branch information
wjwwood committed Jan 29, 2014
2 parents df24347 + c5828a8 commit 34d1284
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion bloom/commands/export_upstream.py
Expand Up @@ -50,6 +50,7 @@
from bloom.logging import warning

from bloom.git import branch_exists
from bloom.git import get_root
from bloom.git import has_submodules
from bloom.git import tag_exists

Expand Down Expand Up @@ -120,7 +121,7 @@ def export_upstream(uri, tag, vcs_type, output_dir, show_uri, name):
error("Failed to clone repository at '{0}'".format(uri) +
(" to reference '{0}'.".format(tag) if tag else '.'),
exit=True)
if has_submodules(upstream_repo.get_path()):
if get_root() is not None and has_submodules(upstream_repo.get_path()):
error("""\
bloom does not support exporting git repositories with submodules, see:
Expand Down

0 comments on commit 34d1284

Please sign in to comment.