ADDED: some changes around the user rpmbuild directory creation

FIXED: minor formatting changed to the default macros template
dgutierrez1287 · Dec 23, 2013 · 488b006 · 488b006
1 parent f337767
commit 488b006
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 8 deletions.
diff --git a/manifests/env/userhome.pp b/manifests/env/userhome.pp
@@ -56,7 +56,6 @@
     owner   => $username,
     group   => $username,
     mode    => 0644,
-    require => File ["/home/${username}"],
   }
 
   if $usedefaultmacros == 'yes' {

diff --git a/spec/fixtures/modules/rpmbuild/manifests/env/userhome.pp b/spec/fixtures/modules/rpmbuild/manifests/env/userhome.pp
@@ -56,7 +56,6 @@
     owner   => $username,
     group   => $username,
     mode    => 0644,
-    require => File ["/home/${username}"],
   }
 
   if $usedefaultmacros == 'yes' {

diff --git a/spec/fixtures/modules/rpmbuild/templates/default_macros.erb b/spec/fixtures/modules/rpmbuild/templates/default_macros.erb
@@ -3,8 +3,6 @@
 
 %_topdir		%(echo $HOME)/rpmbuild
 %packager		<%= @userfirstname %> <%= @userlastname %> <<%= @emailaddress %>>
-<% if @companyname != ' ' %>%vendor	<%= @companyname %>
-<% else %>%vendor	<%= @userfirstname %> <%= @userlastname %>
-<% end %>
+<% if @companyname != ' ' %>%vendor	                <%= @companyname %> <% else %>%vendor	                <%= @userfirstname %> <%= @userlastname %> <% end %>
 %_tmppath		%(echo $HOME)/rpmbuild/tmp
 %debug_package		%{nil}
diff --git a/templates/default_macros.erb b/templates/default_macros.erb
@@ -3,8 +3,6 @@
 
 %_topdir		%(echo $HOME)/rpmbuild
 %packager		<%= @userfirstname %> <%= @userlastname %> <<%= @emailaddress %>>
-<% if @companyname != ' ' %>%vendor	<%= @companyname %>
-<% else %>%vendor	<%= @userfirstname %> <%= @userlastname %>
-<% end %>
+<% if @companyname != ' ' %>%vendor	                <%= @companyname %> <% else %>%vendor	                <%= @userfirstname %> <%= @userlastname %> <% end %>
 %_tmppath		%(echo $HOME)/rpmbuild/tmp
 %debug_package		%{nil}