Missed the - for -y, but also tests were missing lsbdistid

diff --git a/Gemfile b/Gemfile
index cd7fbc89b8b34018b9c9ac830299f7af65f9acd2..1e359d07b563e2c3d869945136c3ab01aa00b64e 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -2,6 +2,7 @@ source ENV['GEM_SOURCE'] || 'https://rubygems.org'
 
 group :development, :test do
   gem 'rake',                    :require => false
+  gem 'pry',                     :require => false
   gem 'rspec-puppet',            :require => false
   gem 'puppet-lint',             :require => false
   gem 'puppetlabs_spec_helper',  :require => false

diff --git a/manifests/params.pp b/manifests/params.pp
index ae464436dadefdc3a451302ca5819db596f072ca..51a01be91a9f07772a606a6afbc30801ccedbc34 100644 (file)
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -23,7 +23,7 @@ class apt::params {
       case $::lsbdistcodename {
         'hardy','maverick','natty','oneiric','precise': {
           $backports_location = 'http://us.archive.ubuntu.com/ubuntu'
-          $ppa_options = 'y'
+          $ppa_options = '-y'
         }
         'lucid': {
           $backports_location = 'http://us.archive.ubuntu.com/ubuntu'
@@ -31,7 +31,7 @@ class apt::params {
         }
         default: {
           $backports_location = 'http://old-releases.ubuntu.com/ubuntu'
-          $ppa_options = 'y'
+          $ppa_options = '-y'
         }
       }
     }

diff --git a/spec/defines/ppa_spec.rb b/spec/defines/ppa_spec.rb
index dc1173b8970c3c88fc6cd8c01709c10dd6b5c917..6a571a81fbf858217cc0e8ab0c90cc18e7846fc4 100644 (file)
--- a/spec/defines/ppa_spec.rb
+++ b/spec/defines/ppa_spec.rb
@@ -1,20 +1,28 @@
 require 'spec_helper'
 describe 'apt::ppa', :type => :define do
-  [ { :lsbdistrelease => '11.04',
+  [
+    {
+      :lsbdistrelease  => '11.04',
       :lsbdistcodename => 'natty',
       :operatingsystem => 'Ubuntu',
-      :package => 'python-software-properties'},
-    { :lsbdistrelease => '12.10',
+      :lsbdistid       => 'Ubuntu',
+      :package         => 'python-software-properties'
+    },
+    {
+      :lsbdistrelease  => '12.10',
       :lsbdistcodename => 'quantal',
       :operatingsystem => 'Ubuntu',
-      :package => 'software-properties-common'},
+      :lsbdistid       => 'Ubuntu',
+      :package         => 'software-properties-common'
+    },
   ].each do |platform|
     context "on #{platform[:lsbdistcodename]}" do
       let :facts do
         {
-          :lsbdistrelease => platform[:lsbdistrelease],
+          :lsbdistrelease  => platform[:lsbdistrelease],
           :lsbdistcodename => platform[:lsbdistcodename],
           :operatingsystem => platform[:operatingsystem],
+          :lsbdistid       => platform[:lsbdistid],
         }
       end
       let :release do