This is an automated email from the git hooks/post-receive script. wrar-guest pushed a commit to branch master in repository xboxdrv.
commit b1d961cb2fd221a4853077053042537cdb97d0fd Author: Joel Pedraza <[email protected]> Date: Fri May 2 10:07:32 2014 -0400 bus option actually changes bus, remove unused dbus object option --- xboxdrvctl | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/xboxdrvctl b/xboxdrvctl index cb57668..5b2867f 100755 --- a/xboxdrvctl +++ b/xboxdrvctl @@ -26,12 +26,9 @@ parser = OptionParser("Usage: %prog [OPTIONS]\n" group = OptionGroup(parser, "D-Bus Options") group.add_option("-b", "--bus", metavar="BUS", - dest="connection", default="org.seul.Xboxdrv", - help="connect to D-Bus bus BUS") + dest="bus", default="auto", + help="connect to D-Bus bus BUS (auto, session, system)") -group.add_option("-o", "--object", metavar="OBJ", - dest="object", default="connect List all resource files", - help="use D-Bus object OBJ") parser.add_option_group(group) group = OptionGroup(parser, "Xboxdrv Options") @@ -63,7 +60,19 @@ parser.add_option_group(group) (options, args) = parser.parse_args() -bus = dbus.SessionBus() +if options.bus == "session": + bus = dbus.SessionBus() +elif options.bus == "system": + bus = dbus.SystemBus() +elif options.bus == "auto": + bus = dbus.SessionBus() + try: + bus.get_object("org.seul.Xboxdrv", '/org/seul/Xboxdrv/Daemon') + except dbus.exceptions.DBusException: + bus = dbus.SystemBus() +else: + print "Error: invalid argument to --bus. Must be 'auto', 'session, or 'system'" + exit() if options.status: daemon = bus.get_object("org.seul.Xboxdrv", '/org/seul/Xboxdrv/Daemon') -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/xboxdrv.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
