summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Thursfield <sam.thursfield@codethink.co.uk>2014-10-10 11:16:30 +0100
committerSam Thursfield <sam.thursfield@codethink.co.uk>2014-10-10 11:16:30 +0100
commit2def540ea6df4837b061c52a76a96f9de0e5763d (patch)
tree169bf72cef9e547e27be63a64710d2a3f93e0cb1
parent4b9589783f4b5f956422d97d8692423a0a14b478 (diff)
downloadmorph-2def540ea6df4837b061c52a76a96f9de0e5763d.tar.gz
import: Fix and improve rubygems.to_lorry errors
-rw-r--r--import/importer_base.py2
-rwxr-xr-ximport/rubygems.to_lorry5
2 files changed, 3 insertions, 4 deletions
diff --git a/import/importer_base.py b/import/importer_base.py
index 7775aa4a..5def0dc4 100644
--- a/import/importer_base.py
+++ b/import/importer_base.py
@@ -68,5 +68,5 @@ class ImportExtension(object):
try:
self.process_args(sys.argv[1:])
except ImportException as e:
- sys.stderr.write('ERROR: %s' % e.message)
+ sys.stderr.write('ERROR: %s\n' % e.message)
sys.exit(1)
diff --git a/import/rubygems.to_lorry b/import/rubygems.to_lorry
index 898f0514..7a00820d 100755
--- a/import/rubygems.to_lorry
+++ b/import/rubygems.to_lorry
@@ -118,9 +118,8 @@ class RubyGemLorryGenerator(ImportExtension):
# the correct one, but you can never know.
raise GenerateLorryException(
- "Did not manage to find the upstream source URL for Gem '%s'. "
- "Please manually create a .lorry file, or add the Gem to "
- "known-source-uris in rubygems.yaml." % gem_name)
+ "Gem metadata for '%s' does not point to its source code "
+ "repository." % gem_name)
def project_name_from_repo(self, repo_url):
if repo_url.endswith('/tree/master'):