split requires line, slight code cleanup

yast · May 13, 2014 · 8a4cb3b · 8a4cb3b
1 parent d73cc68
commit 8a4cb3b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 13 deletions.
diff --git a/src/include/product-creator/kiwi_dialogs.rb b/src/include/product-creator/kiwi_dialogs.rb
@@ -1131,8 +1131,8 @@ def HandleAddEditUser(key, event)
           Ops.get_string(group_map, "group", "")
         )
         if Ops.get_string(user_map, "password", "") != ""
-          UI.ChangeWidget(Id(:pw1), :Value, Ops.get_string(user_map, "password", ""))
-          UI.ChangeWidget(Id(:pw2), :Value, Ops.get_string(user_map, "password", ""))
+          UI.ChangeWidget(Id(:pw1), :Value, user_map["password"])
+          UI.ChangeWidget(Id(:pw2), :Value, user_map["password"])
         end
         # popup label
         UI.ChangeWidget(Id(:label), :Value, _("Edit User"))

diff --git a/src/modules/Kiwi.rb b/src/modules/Kiwi.rb
@@ -518,17 +518,8 @@ def WriteConfigXML(_KiwiConfig, task)
             gmap,
             "user",
             Builtins.maplist(Ops.get_list(gmap, "user", [])) do |umap|
-              encrypted = Ops.get_boolean(umap, "encrypted", false)
-              Ops.set(
-                umap,
-                "password",
-                Ops.get_boolean(umap, "encrypted", false) ?
-                  Ops.get_string(umap, "password", "") :
-                  crypt_password(Ops.get_string(umap, "password", ""))
-              )
-              if Builtins.haskey(umap, "encrypted")
-                umap = Builtins.remove(umap, "encrypted")
-              end
+              umap["password"] = crypt_password(umap["password"]) if (umap["encrypted"] || false)
+              umap.delete "encrypted"
               deep_copy(umap)
             end
           )