rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-09-09 18:50:04 +00:00
Code Issues Releases Wiki Activity

fix tests

Browse Source 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
This commit is contained in:
Sven Dowideit
2017-08-17 09:31:52 +10:00
parent f793518aa6
commit 38ac3b05fb
2 changed files with 45 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
config/cmdline/cmdline.go
View File

@@ -49,7 +49,7 @@ func GetOrSetVal(args string, data map[interface{}]interface{}, value interface{
// Reached end, set the value
if last && value != nil {
if s, ok := value.(string); ok {
value = unmarshalOrReturnString(s)
value = UnmarshalOrReturnString(s)
}
t[part] = value
@@ -113,7 +113,7 @@ func reverseReplacement(result interface{}) interface{} {
return result
}
func unmarshalOrReturnString(value string) (result interface{}) {
func UnmarshalOrReturnString(value string) (result interface{}) {
value = strings.Replace(value, "\n", newlineMagicString, -1)
value = strings.Replace(value, ":", colonMagicString, -1)
value = strings.Replace(value, "?", questionMarkMagicString, -1)
@@ -150,7 +150,7 @@ outer:
keys := strings.Split(kv[0], ".")
for i, key := range keys {
if i == len(keys)-1 {
current[key] = unmarshalOrReturnString(value)
current[key] = UnmarshalOrReturnString(value)
} else {
if obj, ok := current[key]; ok {
if newCurrent, ok := obj.(map[interface{}]interface{}); ok {