]> review.fuel-infra Code Review - puppet-modules/puppetlabs-apt.git/commitdiff
Fix the name of sources.list.d file resource in apt::ppa
authorMarco Nenciarini <marco.nenciarini@2ndquadrant.it>
Mon, 2 Dec 2013 12:17:00 +0000 (13:17 +0100)
committerMarco Nenciarini <marco.nenciarini@2ndquadrant.it>
Mon, 2 Dec 2013 12:40:22 +0000 (13:40 +0100)
manifests/ppa.pp
spec/defines/ppa_spec.rb

index 253e72ffb1af0b465f8308469ff20a2988ff8e1d..730bf7d198f452728097879841d83008f77531eb 100644 (file)
@@ -48,7 +48,7 @@ define apt::ppa(
         logoutput    => 'on_failure',
         notify       => Exec['apt_update'],
         require      => [
-        File[$sources_list_d],
+        File['sources.list.d'],
         Package[$package],
         ],
     }
index 5b59f57776bc389e4f1c4bf7e9ef24ac09ab8e67..a05ca306452a8d08c48bd30cc706f40d18505cd5 100644 (file)
@@ -46,7 +46,7 @@ describe 'apt::ppa', :type => :define do
           it { should contain_exec("add-apt-repository-#{t}").with(
             'command' => "/usr/bin/add-apt-repository #{options} #{t}",
             'unless'  => "/usr/bin/test -s /etc/apt/sources.list.d/#{filename}",
-            'require' => ["File[/etc/apt/sources.list.d]", "Package[#{package}]"],
+            'require' => ["File[sources.list.d]", "Package[#{package}]"],
             'notify'  => "Exec[apt_update]"
             )
           }
@@ -75,7 +75,7 @@ describe 'apt::ppa', :type => :define do
           'environment' => [],
           'command'     => "/usr/bin/add-apt-repository #{options} #{title}",
           'unless'      => "/usr/bin/test -s /etc/apt/sources.list.d/#{filename}",
-          'require'     => ["File[/etc/apt/sources.list.d]", "Package[#{package}]"],
+          'require'     => ["File[sources.list.d]", "Package[#{package}]"],
           'notify'      => "Exec[apt_update]"
           )
         }
@@ -101,7 +101,7 @@ describe 'apt::ppa', :type => :define do
           ],
           'command'     => "/usr/bin/add-apt-repository #{options} #{title}",
           'unless'      => "/usr/bin/test -s /etc/apt/sources.list.d/#{filename}",
-          'require'     => ["File[/etc/apt/sources.list.d]", "Package[#{package}]"],
+          'require'     => ["File[sources.list.d]", "Package[#{package}]"],
           'notify'      => "Exec[apt_update]"
           )
         }