From 54099f5ef7269a0b2d964a56cdfcf19af98473da Mon Sep 17 00:00:00 2001 From: Markus Lehtonen Date: Mon, 26 Aug 2013 23:18:39 +0300 Subject: import-orig: import readline in the common module Useful common functionality. Signed-off-by: Markus Lehtonen --- gbp/scripts/common/import_orig.py | 9 +++++++++ gbp/scripts/import_orig.py | 8 -------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/gbp/scripts/common/import_orig.py b/gbp/scripts/common/import_orig.py index a884573..c2c53a6 100644 --- a/gbp/scripts/common/import_orig.py +++ b/gbp/scripts/common/import_orig.py @@ -23,6 +23,15 @@ import gbp.command_wrappers as gbpc from gbp.pkg import UpstreamSource import gbp.log +# Try to import readline, since that will cause raw_input to get fancy +# line editing and history capabilities. However, if readline is not +# available, raw_input will still work. +try: + import readline +except ImportError: + pass + + class OrigUpstreamSource(UpstreamSource): """Upstream source that will be imported""" diff --git a/gbp/scripts/import_orig.py b/gbp/scripts/import_orig.py index d69743e..bd2ce1a 100644 --- a/gbp/scripts/import_orig.py +++ b/gbp/scripts/import_orig.py @@ -33,14 +33,6 @@ from gbp.scripts.common.import_orig import (OrigUpstreamSource, cleanup_tmp_tree ask_package_name, ask_package_version, repack_source, is_link_target) -# Try to import readline, since that will cause raw_input to get fancy -# line editing and history capabilities. However, if readline is not -# available, raw_input will still work. -try: - import readline -except ImportError: - pass - def prepare_pristine_tar(archive, pkg, version): """ -- cgit v1.2.3