Ensure that the enclosing apt.conf.d dir exists

Closes #129
sous-chefs · Mar 23, 2015 · ff517b0 · ff517b0
1 parent d9da784
commit ff517b0
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/recipes/default.rb b/recipes/default.rb
@@ -50,6 +50,10 @@
 end
 
 # Updates 'apt-get update' timestamp after each update success
+directory '/etc/apt/apt.conf.d' do
+  recursive true
+end
+
 cookbook_file '/etc/apt/apt.conf.d/15update-stamp' do
   source '15update-stamp'
 end

diff --git a/resources/preference.rb b/resources/preference.rb
@@ -31,7 +31,7 @@ def initialize(*args)
             :pin,
             :pin_priority
 
-attribute :package_name, :kind_of => String, :name_attribute => true, :regex => [ /^([a-z]|[A-Z]|[0-9]|_|-|\.)+$/ ]
+attribute :package_name, :kind_of => String, :name_attribute => true, :regex => [/^([a-z]|[A-Z]|[0-9]|_|-|\.)+$/]
 attribute :glob, :kind_of => String
 attribute :pin, :kind_of => String
 attribute :pin_priority, :kind_of => String
diff --git a/resources/repository.rb b/resources/repository.rb
@@ -39,7 +39,7 @@ def initialize(*args)
             :uri
 
 # name of the repo, used for source.list filename
-attribute :repo_name, :kind_of => String, :name_attribute => true, :regex => [ /^([a-z]|[A-Z]|[0-9]|_|-|\.)+$/ ]
+attribute :repo_name, :kind_of => String, :name_attribute => true, :regex => [/^([a-z]|[A-Z]|[0-9]|_|-|\.)+$/]
 attribute :uri, :kind_of => String
 attribute :distribution, :kind_of => String
 attribute :components, :kind_of => Array, :default => []