[fedpkg-autobuilder] Require dbus, add GetModules

1 files changed, 7 insertions, 3 deletions

diff --git a/fedpkg-autobuilder b/fedpkg-autobuilder
index 00e0670..4e10380 100755
--- a/fedpkg-autobuilder
+++ b/fedpkg-autobuilder
@@ -27,9 +27,8 @@ PULLBUILD_OBJPATH = '/org/fedoraproject/FedpkgPullBuildChain'
 
 # First ensure we have a bus
 if not 'DBUS_SESSION_BUS_ADDRESS' in os.environ:
-    args = ['dbus-launch']
-    args.extend(sys.argv)
-    sys.execvp('dbus-launch', args)
+    print "FATAL: Must have DBUS_SESSION_BUS_ADDRESS in environment"
+    sys.exit(1)
 
 def check_call_verbose(*args, **kwargs):
     print "Running: %r" % (args[0], )
@@ -91,6 +90,11 @@ class Autobuilder(dbus.service.Object):
     def GetStatus(self):
         return self._status
         
+    @dbus.service.method(dbus_interface='org.fedoraproject.FedpkgAutoBuilder',
+                         in_signature='', out_signature='as')
+    def GetModules(self):
+        return self._modules
+        
     def _reread_state(self):
         self._state = STATE_SUCCESS
         self._statedata = {}