summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorColin Walters <walters@verbum.org>2010-03-09 10:33:48 -0500
committerColin Walters <walters@verbum.org>2010-03-09 10:35:40 -0500
commit60564d2a62a446e6878d23870a4a48ec4e7b4291 (patch)
treec86ab84e88fa83363eb5d1b7f0b1b9a67087e58d
parente0ed6cb76011c642b3713b13a3bc5394a6e263f5 (diff)
downloadfedpkg-make-pull-60564d2a62a446e6878d23870a4a48ec4e7b4291.tar.gz
fedpkg-make-pull-60564d2a62a446e6878d23870a4a48ec4e7b4291.tar.xz
fedpkg-make-pull-60564d2a62a446e6878d23870a4a48ec4e7b4291.zip
[qabox] Make IRC bot @build command use --force
We can get wedged in certain states, the easiest workaround for now is to just manually force it with @build.
-rwxr-xr-xqabox/fedpkg-autobuilder10
-rw-r--r--qabox/supybot/Fedpkg/plugin.py2
2 files changed, 7 insertions, 5 deletions
diff --git a/qabox/fedpkg-autobuilder b/qabox/fedpkg-autobuilder
index 4d022de..6eec9bb 100755
--- a/qabox/fedpkg-autobuilder
+++ b/qabox/fedpkg-autobuilder
@@ -116,12 +116,14 @@ class Autobuilder(dbus.service.Object):
@dbus.service.method(dbus_interface='org.fedoraproject.FedpkgAutoBuilder',
- in_signature='', out_signature='')
- def Build(self):
+ in_signature='b', out_signature='')
+ def Build(self, force):
if self._pullbuild_pid is not None:
logging.info("Can't initiate build, one is in progress")
return
args = ['fedpkg-pull-build-chain', '--resultdir=' + self._resultdir, '--release=' + self._release]
+ if force:
+ args.append('--force')
if self._architectures is not None:
for arch in self._architectures:
args.append('--arch=' + arch)
@@ -191,8 +193,8 @@ def main():
loop = gobject.MainLoop()
builder = Autobuilder(parser)
- builder.Build()
- glib.timeout_add(build_time * 1000, lambda: builder.Build() or True)
+ builder.Build(False)
+ glib.timeout_add(build_time * 1000, lambda: builder.Build(False) or True)
loop.run()
diff --git a/qabox/supybot/Fedpkg/plugin.py b/qabox/supybot/Fedpkg/plugin.py
index 75c7a42..7732572 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(reply_handler=lambda *args: True, error_handler=lambda *args: True)
+ self._autobuild_proxy.Build(True, reply_handler=lambda *args: True, error_handler=lambda *args: True)
def __on_builder_state_changed(self, state, statedata):
for channel in self.__irc.state.channels: