From fdf8e5ce8bd015eeb2ea9a5c2877810a763ef89f Mon Sep 17 00:00:00 2001 From: Alejandro Huertas Herrero Date: Wed, 8 Apr 2020 11:12:16 +0200 Subject: [PATCH] F #3237: DDC extends multiple templates (#4470) --- src/oneprovision/lib/resources/resource.rb | 2 +- src/oneprovision/lib/utils.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/oneprovision/lib/resources/resource.rb b/src/oneprovision/lib/resources/resource.rb index ce1ec33146..ae6634d5d6 100644 --- a/src/oneprovision/lib/resources/resource.rb +++ b/src/oneprovision/lib/resources/resource.rb @@ -122,7 +122,7 @@ module OneProvision OneProvisionLogger.debug("using gname #{gname} id #{gid}") end - chown(gid, uid) + chown(uid, gid) end # Change object permissions diff --git a/src/oneprovision/lib/utils.rb b/src/oneprovision/lib/utils.rb index bf0cb9a164..378ba7b14f 100644 --- a/src/oneprovision/lib/utils.rb +++ b/src/oneprovision/lib/utils.rb @@ -260,7 +260,7 @@ module OneProvision base['defaults'][section].merge!(defaults) end - base + base end # Gets the value of an ERB expression