From: "Michał Górny" <mgorny@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/pms-test-suite:master commit in: pmstestsuite/
Date: Tue, 3 Jan 2012 15:52:32 +0000 (UTC) [thread overview]
Message-ID: <04f53d753978b0c1af8b88bbc6e1da169c7372b5.mgorny@gentoo> (raw)
commit: 04f53d753978b0c1af8b88bbc6e1da169c7372b5
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 3 11:45:56 2012 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Jan 3 11:45:56 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/pms-test-suite.git;a=commit;h=04f53d75
Use subprocess to spawn D-Bus.
---
pmstestsuite/dbus_handler.py | 23 +++++++++--------------
1 files changed, 9 insertions(+), 14 deletions(-)
diff --git a/pmstestsuite/dbus_handler.py b/pmstestsuite/dbus_handler.py
index 694ed84..78abe43 100644
--- a/pmstestsuite/dbus_handler.py
+++ b/pmstestsuite/dbus_handler.py
@@ -2,7 +2,7 @@
# (c) 2011-2012 Michał Górny <mgorny@gentoo.org>
# Released under the terms of the 2-clause BSD license.
-import dbus, os, signal, tempfile
+import dbus, os, signal, subprocess, tempfile
from dbus.mainloop.glib import DBusGMainLoop
dbus_interface_name = 'org.gentoo.pmstestsuite'
@@ -36,22 +36,17 @@ class DBusHandler(object):
tmpf.write(dbus_config % (uid, os.getuid()))
tmpf.flush()
- (read_fd, write_fd) = os.pipe()
- self.dbus_pid = os.fork()
- if self.dbus_pid == 0:
- os.close(read_fd)
- os.execlp('dbus-daemon', 'dbus-daemon', '--nofork',
- '--config-file=%s' % tmpf.name,
- '--print-address=%d' % write_fd)
- else:
- addr = os.read(read_fd, 1024)
- os.close(write_fd)
- tmpf.close()
+ self.subp = subprocess.Popen(['dbus-daemon', '--nofork',
+ '--config-file=%s' % tmpf.name, '--print-address'],
+ stdout = subprocess.PIPE, close_fds = True)
- self.bus_address = addr.strip()
+ addr = self.subp.stdout.readline()
+ tmpf.close()
+
+ self.bus_address = addr.strip()
def terminate(self):
- os.kill(self.dbus_pid, signal.SIGTERM)
+ self.subp.terminate()
def __init__(self, uid):
""" Initialize DBusHandler. Add it to main GLib loop. """
next reply other threads:[~2012-01-03 15:52 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-03 15:52 Michał Górny [this message]
-- strict thread matches above, loose matches on Subject: below --
2012-06-20 8:01 [gentoo-commits] proj/pms-test-suite:master commit in: pmstestsuite/ Michał Górny
2012-01-04 16:33 Michał Górny
2012-01-03 15:52 Michał Górny
2012-01-03 15:52 Michał Górny
2012-01-03 15:52 Michał Górny
2011-08-21 8:19 Michał Górny
2011-08-20 6:23 Michał Górny
2011-08-13 7:38 Michał Górny
2011-08-08 22:15 Michał Górny
2011-08-05 21:36 Michał Górny
2011-08-05 17:09 Michał Górny
2011-08-05 17:09 Michał Górny
2011-08-05 17:09 Michał Górny
2011-08-05 17:09 Michał Górny
2011-08-05 17:09 Michał Górny
2011-08-05 17:09 Michał Górny
2011-08-05 17:09 Michał Górny
2011-08-05 10:04 Michał Górny
2011-08-03 20:17 Michał Górny
2011-08-03 20:17 Michał Górny
2011-08-03 20:17 Michał Górny
2011-08-03 20:17 Michał Górny
2011-08-03 8:17 Michał Górny
2011-08-02 18:53 Michał Górny
2011-07-18 6:49 Michał Górny
2011-06-24 18:03 [gentoo-commits] proj/pms-test-suite:master commit in: PMSTestSuite/ Michał Górny
2011-06-22 19:53 Michał Górny
2011-06-21 17:58 Michał Górny
2011-06-21 17:54 Michał Górny
2011-06-21 17:54 Michał Górny
2011-06-16 19:49 Michał Górny
2011-06-15 16:14 Michał Górny
2011-06-13 19:16 Michał Górny
2011-06-11 6:32 Michał Górny
2011-06-09 5:48 Michał Górny
2011-06-07 16:48 Michał Górny
2011-06-07 16:48 Michał Górny
2011-06-07 15:20 Michał Górny
2011-06-06 5:56 Michał Górny
2011-06-03 16:25 Michał Górny
2011-05-31 21:06 Michał Górny
2011-05-31 19:18 Michał Górny
2011-05-31 17:19 Michał Górny
2011-05-31 17:19 Michał Górny
2011-05-29 17:46 Michał Górny
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=04f53d753978b0c1af8b88bbc6e1da169c7372b5.mgorny@gentoo \
--to=mgorny@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox