Move no_upstream_branch message into gbp.config

Git-Dch: Ignore

2 files changed, 8 insertions, 6 deletions

diff --git a/gbp/config.py b/gbp/config.py
index 00b8dbc..103920e 100644
--- a/gbp/config.py
+++ b/gbp/config.py
@@ -13,6 +13,12 @@ except ImportError:
     gbp_version = "[Unknown version]"
 import gbp.tristate
 
+no_upstream_branch_msg = """
+Repository does not have branch '%s' for upstream sources. If there is none see
+file:///usr/share/doc/git-buildpackage/manual-html/gbp.import.html#GBP.IMPORT.CONVERT
+on howto create it otherwise use --upstream-branch to specify it.
+"""
+
 def expand_path(option, opt, value):
     value = os.path.expandvars(value)
     return os.path.expanduser(value)
diff --git a/git-import-orig b/git-import-orig
index 391c5ee..2f5553c 100755
--- a/git-import-orig
+++ b/git-import-orig
@@ -35,7 +35,7 @@ from gbp.deb import (parse_changelog, unpack_orig, repack_orig,
                      packagename_msg, is_valid_upstreamversion,
                      upstreamversion_msg)
 from gbp.git import (FastImport, GitRepositoryError, GitRepository, build_tag)
-from gbp.config import GbpOptionParser, GbpOptionGroup
+from gbp.config import GbpOptionParser, GbpOptionGroup, no_upstream_branch_msg
 from gbp.errors import (GbpError, GbpNothingImported)
 import gbp.log
 
@@ -296,11 +296,7 @@ def main(argv):
             turn_off_fastimport(options, "Fast importing into empty archives not yet supported.")
 
         if not repo.has_branch(options.upstream_branch) and not is_empty:
-            gbp.log.err("""
-Repository does not have branch '%s' for upstream sources. If there is none see
-file:///usr/share/doc/git-buildpackage/manual-html/gbp.import.html#GBP.IMPORT.CONVERT
-on howto create it otherwise use --upstream-branch to specify it.
-"""  % options.upstream_branch)
+            gbp.log.err(no_upstream_branch_msg % options.upstream_branch)
             raise GbpError
 
         # Guess defaults for the package name and version from the