patch against layman-9999

0001-Allow-addition-of-multiple-git_syncopts-e.g.-origin-.patch (text/plain), 1.32 KB, created by Michael Weber (RETIRED) on 2014-08-18 23:09:30 UTC

From 5864d978b140f161d1513ebc410fc0d32faf1a6c Mon Sep 17 00:00:00 2001
From: Michael Weber <[e-mail]>
Date: Tue, 19 Aug 2014 00:45:26 +0200
Subject: [PATCH] Allow addition of multiple git_syncopts, e.g. 'origin master'
 to pull into a branch containing local modifications.

---
 etc/layman.cfg         | 1 +
 layman/overlays/git.py | 3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/etc/layman.cfg b/etc/layman.cfg
index 6b94c68..c215bc2 100644
--- a/etc/layman.cfg
+++ b/etc/layman.cfg
@@ -196,6 +196,7 @@ news_reporter: portage
 #
 # These commnad options will be added to the above commands
 # when the overlay is added or synced.
+# Use newlines to seperate command line arguments
 #
 #    note: there are some options hardcoded in the backend
 #          scripts already.  All VCS types listed here are
diff --git a/layman/overlays/git.py b/layman/overlays/git.py
index f3ada66..c507343 100644
--- a/layman/overlays/git.py
+++ b/layman/overlays/git.py
@@ -133,8 +133,7 @@ class GitOverlay(OverlaySource):
         args = ['pull']
         if self.config['quiet']:
             args.append('-q')
-        if len(cfg_opts):
-            args.append(cfg_opts)
+        args += cfg_opts.split('\n')
 
         return self.postsync(
             self.run_command(self.command(), args, cwd=target, cmd=self.type),
-- 
2.0.4