From dbc9c1ca3b909ab990b705ad83ddc81344077117 Mon Sep 17 00:00:00 2001 From: Pedro Alvarez Date: Thu, 20 Feb 2014 18:42:15 +0000 Subject: Modify 'baserock-system-config-sync' to get two arguments using 'merge' 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. --- system-version-manager/system-version-manager | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'system-version-manager') 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") -- cgit v1.2.1