diff options
Diffstat (limited to 'installer')
| -rw-r--r-- | installer/distros.dat | 16 | ||||
| -rwxr-xr-x | installer/pluginhandler.py | 13 | ||||
| -rwxr-xr-x | installer/text_install.py | 10 |
3 files changed, 24 insertions, 15 deletions
diff --git a/installer/distros.dat b/installer/distros.dat index e74a6e20a..2f2ffb322 100644 --- a/installer/distros.dat +++ b/installer/distros.dat @@ -1241,7 +1241,7 @@ ui_toolkit=qt3 # **************************************** [rhel] index=7 -versions=5.0,6.0,7.0 +versions=5.0,6.0,7.0,7.1 display_name=Red Hat Enterprise Linux alt_names=red hat enterprise linux display=1 @@ -1501,6 +1501,12 @@ release_date=10/06/2014 same_as_version=6.0 # **************************************** +[rhel:7.1] +packaged_version=3.14.7 +release_date=05/03/2015 +same_as_version=7.0 + +# **************************************** [slackware] index=8 versions=9.0,9.1,10.0,10.1,10.2,11,12,12.1 @@ -3596,7 +3602,7 @@ packages=python3-reportlab # **************************************** [debian] index=2 -versions=6.0,6.0.1,6.0.2,6.0.3,6.0.4,6.0.5,6.0.6,6.0.7,6.0.8,6.0.9,6.0.10,7.0,7.1,7.2,7.3,7.4,7.5,7.6,7.7,7.8,8.0 +versions=6.0,6.0.1,6.0.2,6.0.3,6.0.4,6.0.5,6.0.6,6.0.7,6.0.8,6.0.9,6.0.10,7.0,7.1,7.2,7.3,7.4,7.5,7.6,7.7,7.8,8.0,8.1 display_name=Debian alt_names= display=1 @@ -4094,6 +4100,12 @@ packages=python3-pil [debian:8.0:python3-reportlab] packages=python3-reportlab + +# ********************* + +[debian:8.1] +same_as_version=8.0 + # ********************* [xandros] diff --git a/installer/pluginhandler.py b/installer/pluginhandler.py index 7a922bb31..2bed908d2 100755 --- a/installer/pluginhandler.py +++ b/installer/pluginhandler.py @@ -22,7 +22,7 @@ import os import shutil -from base import utils, tui, os_utils, validation +from base import utils, tui, os_utils, validation, password from base.g import * from base.codes import * from base.strings import * @@ -350,19 +350,18 @@ class PluginHandle(object): exec_str = sys.executable if mode == GUI_MODE: cmd = "sh %s --keep --nox11 -- -u %s" % (plugin_file, exec_str) + status = os_utils.execute(cmd) else: cmd = "sh %s --keep --nox11 -- -i %s" % (plugin_file, exec_str) - - if os_utils.execute(cmd) == 0: + status = os_utils.execute(cmd) + if status == 0: result = True else: log.error("Python gobject/dbus may be not installed") result = False - try: - shutil.rmtree('./plugin_tmp') - except OSError: - log.warn("Failed to remove the temporary files") + + utils.remove('./plugin_tmp') os.chdir(cwd) return result diff --git a/installer/text_install.py b/installer/text_install.py index 62cd11546..96378ddc6 100755 --- a/installer/text_install.py +++ b/installer/text_install.py @@ -891,15 +891,13 @@ def start(language, auto=True, test_depends=False, if ok and choice == 'y': ok, choice = tui.enter_choice("Do you want to install plug-in's in GUI mode?. (u=GUI mode*, i=Interactive mode) : ",['u', 'i'], 'u') if ok and choice == 'u': - if not services.run_hp_tools_with_auth('hp-plugin', core.passwordObj): - log.error("hp-plugin command failed. Please run hp-plugin manually.") + plugin_cmd = 'hp-plugin -u' elif ok and choice == 'i': - plugin_cmd = core.passwordObj.getAuthCmd() % 'hp-plugin -i' - log.info("Running '%s' command...."%plugin_cmd) - if os_utils.execute(plugin_cmd) != 0: - log.error("hp-plugin command failed. Please run hp-plugin manually.") + plugin_cmd = 'hp-plugin -i' else: log.info(log.bold("Please install hp plugin's manually, otherwise some functionality may break")) + if os_utils.execute(plugin_cmd) != 0: + log.error("hp-plugin command failed. Please run hp-plugin manually.") else: log.info(log.bold("Please install hp plugin's manually, otherwise some functionality may break")) |