Regularly pull sources

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/Makefile.am b/Makefile.am
index a3ba07693269d15cdb2453d59359e42f1c4031c7..709127228a05089e1a7d7034c368b7240086cb91 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -124,8 +124,7 @@ manager_PYTHON = \
        src/manager/__init__.py \
        src/manager/base.py \
        src/manager/builds.py \
-       src/manager/repositories.py \
-       src/manager/sources.py
+       src/manager/repositories.py
 
 managerdir = $(buildservicedir)/manager
 

diff --git a/src/crontab/pakfire-build-service b/src/crontab/pakfire-build-service
index 602de7e7cfc18a9786bc109f96e31e6159c23301..1eaf13340ff1b0191920f1d12a106fe0e198eba2 100644 (file)
--- a/src/crontab/pakfire-build-service
+++ b/src/crontab/pakfire-build-service
@@ -1,6 +1,9 @@
 # Send queued emails once a minute
 * * * * *      nobody  pakfire-build-service process-message-queue &>/dev/null
 
+# Pull sources
+*/5 * * * *    nobody  pakfire-build-service pull-sources &>/dev/null
+
 # Send updates to Bugzilla
 */5 * * * *    nobody  pakfire-build-service send-bug-updates &>/dev/null
 

diff --git a/src/manager/__init__.py b/src/manager/__init__.py
index 096e26a55ad7aad352f0c71bc9c00fb7cd4ffdc1..27d0046f158311d1c1189b3d2960fd9619cd9fb6 100644 (file)
--- a/src/manager/__init__.py
+++ b/src/manager/__init__.py
@@ -3,4 +3,3 @@
 from .builds       import BuildsFailedRestartEvent, CheckBuildDependenciesEvent
 from .builds       import CreateTestBuildsEvent, DistEvent
 from .repositories import RepositoriesUpdateEvent
-from .sources      import SourcesPullEvent

diff --git a/src/manager/sources.py b/src/manager/sources.py
deleted file mode 100644 (file)
index 1040565..0000000
--- a/src/manager/sources.py
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/usr/bin/python
-
-from .. import git
-
-from . import base
-
-class SourcesPullEvent(base.Event):
-       # This should run whenever possible, so the user can see his commits
-       # very quickly in the build service.
-       priority = 1
-
-       @property
-       def interval(self):
-               return self.pakfire.settings.get_int("source_update_interval", 60)
-
-       def run(self):
-               for source in self.pakfire.sources.get_all():
-                       repo = git.Repo(self.pakfire, source.id, mode="mirror")
-
-                       # If the repository is not yet cloned, we need to make a local
-                       # clone to work with.
-                       if not repo.cloned:
-                               repo.clone()
-
-                       # Otherwise we just fetch updates.
-                       else:
-                               repo.fetch()
-
-                       # Import all new revisions.
-                       repo.import_revisions()

diff --git a/src/scripts/pakfire-build-service b/src/scripts/pakfire-build-service
index 7b39ef4bdd44fd61e38434164c6cbe16b849d0f4..c60dee1e859c21adecbc1211298cc0a9aeed62f8 100644 (file)
--- a/src/scripts/pakfire-build-service
+++ b/src/scripts/pakfire-build-service
@@ -29,6 +29,9 @@ class Cli(object):
                        # Sends all queued messages
                        "process-message-queue" : self.backend.messages.process_queue,
 
+                       # Pull sources
+                       "pull-sources" : self.backend.sources.pull,
+
                        # Send bug updates to Bugzilla
                        "send-bug-updates" : self.backend.bugzilla.send_all,
                }

diff --git a/src/scripts/pakfire-manager b/src/scripts/pakfire-manager
index 42f1aa91215fdba6265ad1e906adeaf9ad12c62b..c6b67a7e2c61f682cce054f68ba3a10d6a56e5c9 100644 (file)
--- a/src/scripts/pakfire-manager
+++ b/src/scripts/pakfire-manager
@@ -23,7 +23,6 @@ events = (
        pakfire.buildservice.manager.CreateTestBuildsEvent,
        pakfire.buildservice.manager.DistEvent,
        pakfire.buildservice.manager.RepositoriesUpdateEvent,
-       pakfire.buildservice.manager.SourcesPullEvent,
 )
 
 # Add all events to the scheduler.