Use gbs-specific default repository cache directory

Instead of sharing repo cache with the git-buildpackage service (by
default). This is probably safer for the future if we start to use
different repo layout/settings in the services - e.g. start to
support bare repos for the git-buildpackage service.

Change-Id: I6f3a81f4e3564409fb933ed30219610d7d094c88
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>

diff --git a/config/gbs b/config/gbs
index f2bc9e8..098d52b 100644 (file)
--- a/config/gbs
+++ b/config/gbs
@@ -4,8 +4,9 @@
 
 [general]
 ## Repository cache directory.
-## Default is '/var/cache/obs/git-buildpackage-repos/' which makes the gbs
-## gbs service share repository cache with the git-buildpackage service.
+## Default is '/var/cache/obs/gbs-repos/'
+## You can configure the service to share the repository cache with the
+## git-buildpackage service.
 ## You probably need to define if the service is run on the client side as
 ## the default directory is likely not accessible by regular users.
 #repo-cache-dir = /var/cache/obs/git-buildpackage-repos/

diff --git a/obs_service_gbs/command.py b/obs_service_gbs/command.py
index ded951e..72e6de1 100644 (file)
--- a/obs_service_gbs/command.py
+++ b/obs_service_gbs/command.py
@@ -44,8 +44,7 @@ def construct_gbs_args(args, outdir):
 
 def read_config(filenames):
     '''Read configuration file(s)'''
-    # By default, share repos with git-buildpackage service
-    defaults = {'repo-cache-dir': '/var/cache/obs/git-buildpackage-repos/'}
+    defaults = {'repo-cache-dir': '/var/cache/obs/gbs-repos/'}
 
     filenames = [os.path.expanduser(fname) for fname in filenames]
     LOGGER.debug('Trying %s config files: %s' % (len(filenames), filenames))