diff options
author | Chris Lumens <clumens@redhat.com> | 2012-08-03 10:35:34 -0400 |
---|---|---|
committer | Chris Lumens <clumens@redhat.com> | 2012-08-03 10:35:34 -0400 |
commit | 3671cc86e836990077820556387cbb416e709bbd (patch) | |
tree | c8754fc1809bd175304f51bb11776022e9b7ec9d /pyanaconda/vnc.py | |
parent | ed8bf92fc65050f54463df959a9209ae43af0c54 (diff) | |
parent | db84929284ce85a7af580738551fcc6e172cc690 (diff) | |
download | anaconda-3671cc86e836990077820556387cbb416e709bbd.tar.gz anaconda-3671cc86e836990077820556387cbb416e709bbd.tar.xz anaconda-3671cc86e836990077820556387cbb416e709bbd.zip |
Merge branch 'master' into newui-merge
Conflicts:
Makefile.am
anaconda
data/systemd/anaconda.target
pyanaconda/bootloader.py
pyanaconda/constants.py
pyanaconda/iutil.py
pyanaconda/kickstart.py
pyanaconda/network.py
pyanaconda/vnc.py
scripts/makeupdates
Diffstat (limited to 'pyanaconda/vnc.py')
-rw-r--r-- | pyanaconda/vnc.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/pyanaconda/vnc.py b/pyanaconda/vnc.py index 64c2ce15d..b06ac8743 100644 --- a/pyanaconda/vnc.py +++ b/pyanaconda/vnc.py @@ -186,7 +186,11 @@ class VncServer: self.log.info(_("Starting VNC...")) # Lets call it from here for now. - self.initialize() + try: + self.initialize() + except Exception, e: + stdoutLog.critical("Could not initialize the VNC server: %s" % e) + sys.exit(1) if self.password and len(self.password) < 6: self.changeVNCPasswdWindow() |