diff options
| author | Colin Walters <walters@verbum.org> | 2010-03-09 11:28:26 -0500 |
|---|---|---|
| committer | Colin Walters <walters@verbum.org> | 2010-03-09 11:28:26 -0500 |
| commit | dec67aa06632a93a689d12c382bb6cec60cf9424 (patch) | |
| tree | 1b23cc79dd7724e69ee6d5a743d2017e9cd9a78f | |
| parent | 3135a84e9baf380cb285989eb057e2d4e9f26e40 (diff) | |
| download | fedpkg-make-pull-dec67aa06632a93a689d12c382bb6cec60cf9424.tar.gz fedpkg-make-pull-dec67aa06632a93a689d12c382bb6cec60cf9424.tar.xz fedpkg-make-pull-dec67aa06632a93a689d12c382bb6cec60cf9424.zip | |
[qabox] Attempt to print build status on @build command
| -rwxr-xr-x | qabox/fedpkg-autobuilder | 6 | ||||
| -rw-r--r-- | qabox/supybot/Fedpkg/plugin.py | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/qabox/fedpkg-autobuilder b/qabox/fedpkg-autobuilder index 6eec9bb..f02f5b2 100755 --- a/qabox/fedpkg-autobuilder +++ b/qabox/fedpkg-autobuilder @@ -116,11 +116,10 @@ class Autobuilder(dbus.service.Object): @dbus.service.method(dbus_interface='org.fedoraproject.FedpkgAutoBuilder', - in_signature='b', out_signature='') + in_signature='b', out_signature='s') def Build(self, force): if self._pullbuild_pid is not None: - logging.info("Can't initiate build, one is in progress") - return + return ("Can't initiate build, one is in progress") args = ['fedpkg-pull-build-chain', '--resultdir=' + self._resultdir, '--release=' + self._release] if force: args.append('--force') @@ -136,6 +135,7 @@ class Autobuilder(dbus.service.Object): self._statusdata = {} self.StatusChanged(self._status, self._statusdata) glib.child_watch_add(self._pullbuild_pid, self.__on_builder_exited) + return "Build started, pid=%d" % (self._pullbuild_pid, ) def __on_name_owner_changed(self, name, prev_owner, new_owner): if name != PULLBUILD_SERVICE: diff --git a/qabox/supybot/Fedpkg/plugin.py b/qabox/supybot/Fedpkg/plugin.py index 7732572..5ce468c 100644 --- a/qabox/supybot/Fedpkg/plugin.py +++ b/qabox/supybot/Fedpkg/plugin.py @@ -72,7 +72,7 @@ class Fedpkg(callbacks.Plugin): if self._autobuild_proxy is None: irc.reply(AUTOBUILD_SERVICE + ' is not running') return - self._autobuild_proxy.Build(True, reply_handler=lambda *args: True, error_handler=lambda *args: True) + self._autobuild_proxy.Build(True, reply_handler=lambda *args: irc.reply(args[0]), error_handler=lambda *args: True) def __on_builder_state_changed(self, state, statedata): for channel in self.__irc.state.channels: |