[master][PATCH] Do not switch between consoles in live, image etc. installations

[Vratislav Podzimek]

Signed-off-by: Vratislav Podzimek 
---
 pyanaconda/exception.py | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pyanaconda/exception.py b/pyanaconda/exception.py
index 4d62388..aeed85f 100644
--- a/pyanaconda/exception.py
+++ b/pyanaconda/exception.py
@@ -30,13 +30,13 @@ import os
 import shutil
 import signal
 import time
-from flags import flags
 import kickstart
 import blivet.errors
 from pyanaconda.ui.communication import hubQ
 from pyanaconda.constants import ROOT_PATH, THREAD_EXCEPTION_HANDLING_TEST
 from pyanaconda.threads import threadMgr
 from pyanaconda.i18n import _
+from pyanaconda import flags

# pylint: disable-msg=E0611
 from gi.repository import GLib
@@ -155,7 +155,8 @@ class AnacondaExceptionHandler(ExceptionHandler):
             pass

def runDebug(self, exc_info):
-        if self._intf_tty_num != 1:
+        if flags.can_touch_runtime_system("switch console")\
+                and self._intf_tty_num != 1:
             iutil.vtActivate(1)

pidfl = "/tmp/vncshell.pid"
@@ -186,7 +187,8 @@ class AnacondaExceptionHandler(ExceptionHandler):
         import pdb
         pdb.post_mortem(exc_info.stack)

-        if self._intf_tty_num != 1:
+        if flags.can_touch_runtime_system("switch console") \
+                and self._intf_tty_num != 1:
             iutil.vtActivate(self._intf_tty_num)

def initExceptionHandling(anaconda):
@@ -194,7 +196,7 @@ def initExceptionHandling(anaconda):
                  "/tmp/program.log", "/tmp/storage.log", "/tmp/ifcfg.log",
                  "/tmp/yum.log", ROOT_PATH + "/root/install.log",
                  "/proc/cmdline" ]
-    if flags.livecdInstall:
+    if flags.flags.livecdInstall:
         fileList.extend(["/var/log/messages"])
     else:
         fileList.extend(["/tmp/syslog"])

[Chris Lumens]

> pyanaconda/exception.py | 10 ++++++----
>  1 file changed, 6 insertions(+), 4 deletions(-)

Looks fine.

- Chris

[Vratislav Podzimek]

On Wed, 2013-05-29 at 15:33 +0200, Vratislav Podzimek wrote:
> Signed-off-by: Vratislav Podzimek
>
> pyanaconda/exception.py | 10 ++++++----
>  1 file changed, 6 insertions(+), 4 deletions(-)
>
> diff --git a/pyanaconda/exception.py b/pyanaconda/exception.py
> index 4d62388..aeed85f 100644
> --- a/pyanaconda/exception.py
> +++ b/pyanaconda/exception.py
> @@ -30,13 +30,13 @@ import os
>  import shutil
>  import signal
>  import time
> -from flags import flags
>  import kickstart
>  import blivet.errors
>  from pyanaconda.ui.communication import hubQ
>  from pyanaconda.constants import ROOT_PATH, THREAD_EXCEPTION_HANDLING_TEST
>  from pyanaconda.threads import threadMgr
>  from pyanaconda.i18n import _
> +from pyanaconda import flags
>
> # pylint: disable-msg=E0611
>  from gi.repository import GLib
> @@ -155,7 +155,8 @@ class AnacondaExceptionHandler(ExceptionHandler):
>              pass
>  def runDebug(self, exc_info):
>    if self._intf_tty_num != 1:
>    if flags.can_touch_runtime_system("switch console")\
>            and self._intf_tty_num != 1:
>        iutil.vtActivate(1)
>
>    pidfl = "/tmp/vncshell.pid"
>
> @@ -186,7 +187,8 @@ class AnacondaExceptionHandler(ExceptionHandler):
>          import pdb
>          pdb.post_mortem(exc_info.stack)
>    if self._intf_tty_num != 1:
>    if flags.can_touch_runtime_system("switch console") \
>            and self._intf_tty_num != 1:
>        iutil.vtActivate(self._intf_tty_num)
>
> def initExceptionHandling(anaconda):
> @@ -194,7 +196,7 @@ def initExceptionHandling(anaconda):
>                   "/tmp/program.log", "/tmp/storage.log", "/tmp/ifcfg.log",
>                   "/tmp/yum.log", ROOT_PATH + "/root/install.log",
>                   "/proc/cmdline" ]
> if flags.livecdInstall:
> if flags.flags.livecdInstall:
>     fileList.extend(["/var/log/messages"])
> else:
>     fileList.extend(["/tmp/syslog"])

I'd like to cherry-pick this to f19-branch. Although there is no bug
filed against it as nobody uses "Debug" in live installations, it is a
simple patch preventing annoying behaviour. Is anybody against it?

[Brian C. Lane]

On Wed, Jun 19, 2013 at 01:03:27PM +0200, Vratislav Podzimek wrote:
> I'd like to cherry-pick this to f19-branch. Although there is no bug
> filed against it as nobody uses "Debug" in live installations, it is a
> simple patch preventing annoying behaviour. Is anybody against it?

We're frozen now, f19-branch needs a freeze exception. At this point I
think we should be pretty strict about it.