diff options
author | René 'Necoro' Neumann <necoro@necoro.net> | 2008-06-19 11:23:24 +0200 |
---|---|---|
committer | René 'Necoro' Neumann <necoro@necoro.net> | 2008-06-19 11:23:24 +0200 |
commit | 48f046aec4df3b09906ca41e2c75ce7e0fb045a6 (patch) | |
tree | 5562fc5377f9592a6293735e8baf78230a1a48a6 /portato/plugins | |
parent | be7f3e89a19cadad856dae717836f9ed3a66c85d (diff) | |
parent | 52f04fc6cccffa7cf31a4d7eab9c9b341f77a293 (diff) | |
download | portato-48f046aec4df3b09906ca41e2c75ce7e0fb045a6.tar.gz portato-48f046aec4df3b09906ca41e2c75ce7e0fb045a6.tar.bz2 portato-48f046aec4df3b09906ca41e2c75ce7e0fb045a6.zip |
Merged from trunk
Diffstat (limited to 'portato/plugins')
-rw-r--r-- | portato/plugins/dbus_init.py | 10 | ||||
-rw-r--r-- | portato/plugins/gpytage.py (renamed from portato/plugins/shutdown.py) | 11 | ||||
-rw-r--r-- | portato/plugins/resume_loop.py | 52 |
3 files changed, 5 insertions, 68 deletions
diff --git a/portato/plugins/dbus_init.py b/portato/plugins/dbus_init.py deleted file mode 100644 index 653af31..0000000 --- a/portato/plugins/dbus_init.py +++ /dev/null @@ -1,10 +0,0 @@ -try: - from dbus.mainloop.glib import threads_init -except ImportError: - threads_init = None - -from portato.constants import USE_CATAPULT - -def dbus_init (*args): - if USE_CATAPULT and threads_init is not None: - threads_init() diff --git a/portato/plugins/shutdown.py b/portato/plugins/gpytage.py index 120bac8..22cc7ef 100644 --- a/portato/plugins/shutdown.py +++ b/portato/plugins/gpytage.py @@ -1,17 +1,16 @@ # -*- coding: utf-8 -*- # -# File: portato/plugins/shutdown.py +# File: portato/plugins/gpytage.py # This file is part of the Portato-Project, a graphical portage-frontend. # -# Copyright (C) 2007 René 'Necoro' Neumann +# Copyright (C) 2008 René 'Necoro' Neumann # This is free software. You may redistribute copies of it under the terms of # the GNU General Public License version 2. # There is NO WARRANTY, to the extent permitted by law. # # Written by René 'Necoro' Neumann <necoro@necoro.net> -import os +from subprocess import Popen -def shutdown (*args, **kwargs): - """Shutdown the computer. May not work if not root.""" - os.system("shutdown -h now") +def gpytage(*args, **kwargs): + Popen(["/usr/bin/gpytage"]) diff --git a/portato/plugins/resume_loop.py b/portato/plugins/resume_loop.py deleted file mode 100644 index e4531d0..0000000 --- a/portato/plugins/resume_loop.py +++ /dev/null @@ -1,52 +0,0 @@ -# -*- coding: utf-8 -*- -# -# File: portato/plugins/resume_loop.py -# This file is part of the Portato-Project, a graphical portage-frontend. -# -# Copyright (C) 2007 René 'Necoro' Neumann -# This is free software. You may redistribute copies of it under the terms of -# the GNU General Public License version 2. -# There is NO WARRANTY, to the extent permitted by law. -# -# Written by René 'Necoro' Neumann <necoro@necoro.net> - -import pty, time -from subprocess import Popen, STDOUT -from portato.backend import system -from portato.helper import debug, warning - -console = None -title_update = None -command = "until emerge --resume --skipfirst; do : ; done" - -def set_data (*args, **kwargs): - global console, title_update - console = kwargs["console"] - title_update = kwargs["title_update"] - -def resume_loop (retcode, *args, **kwargs): - if retcode is None: - warning(_("Resume-loop called while process is still running!")) - elif retcode == 0: - # everything ok - ignore - #pass - debug("Everything is ok.") - else: - if console is None: - debug("No console for the resume loop...") - else: - # open tty - (master, slave) = pty.openpty() - console.set_pty(master) - p = Popen(command, stdout = slave, stderr = STDOUT, shell = True, env = system.get_environment()) - - # update titles - old_title = console.get_window_title() - while p and p.poll() is None: - if title_update : - title = console.get_window_title() - if title != old_title: - title_update(title) - time.sleep(0.5) - - if title_update: title_update(None) |