summaryrefslogtreecommitdiff
path: root/system-version-manager
diff options
context:
space:
mode:
authorPedro Alvarez <pedro.alvarez@codethink.co.uk>2014-02-20 18:42:15 +0000
committerPedro Alvarez <pedro.alvarez@codethink.co.uk>2014-02-24 17:21:09 +0000
commitdbc9c1ca3b909ab990b705ad83ddc81344077117 (patch)
treec3b522c24c07a86b58a25d789c371ed7c16d219d /system-version-manager
parentce2edcba92731c0a83fe59133b64d67afc59212a (diff)
downloadtbdiff-baserock/pedroalvarez/system-version-manager3.tar.gz
Modify 'baserock-system-config-sync' to get two arguments using 'merge'baserock/pedroalvarez/system-version-manager3
Since with 'system-version-manager' is possible to change the default system, 'baserock-system-config-sync' shouldn't get the default system, and get an extra parameter to choose the system version to merge.
Diffstat (limited to 'system-version-manager')
-rwxr-xr-xsystem-version-manager/system-version-manager3
1 files changed, 2 insertions, 1 deletions
diff --git a/system-version-manager/system-version-manager b/system-version-manager/system-version-manager
index e553562..370e141 100755
--- a/system-version-manager/system-version-manager
+++ b/system-version-manager/system-version-manager
@@ -127,7 +127,8 @@ class SystemVersionManager(object):
with open(log, 'w') as f:
subprocess.check_call(
- ['baserock-system-config-sync', 'merge', label],
+ ['baserock-system-config-sync',
+ 'merge', self.current_system, label],
stdout=f)
self.status(msg="Installing the kernel")