Ensure apt::ppa fails on non-Ubuntu.

diff --git a/Rakefile b/Rakefile
index bb60173e570583d99123f4de02db60001d9b77c3..cd3d379958947f18f5aad2ab7b3262686764d49f 100644 (file)
--- a/Rakefile
+++ b/Rakefile
@@ -1,2 +1 @@
 require 'puppetlabs_spec_helper/rake_tasks'
-require 'rspec-system/rake_task'

diff --git a/manifests/ppa.pp b/manifests/ppa.pp
index f9296549ac4e44bd623f5794d2bfa7ffd950ad57..14fbbceba41089f3e7ee683724c748c8c65c5941 100644 (file)
--- a/manifests/ppa.pp
+++ b/manifests/ppa.pp
@@ -14,6 +14,10 @@ define apt::ppa(
     fail('lsbdistcodename fact not available: release parameter required')
   }
 
+  if $::operatingsystem != 'Ubuntu' {
+    fail("apt::ppa is currently supported on Ubuntu only.")
+  }
+
   $filename_without_slashes = regsubst($name, '/', '-', 'G')
   $filename_without_dots    = regsubst($filename_without_slashes, '\.', '_', 'G')
   $filename_without_ppa     = regsubst($filename_without_dots, '^ppa:', '', 'G')

diff --git a/spec/defines/ppa_spec.rb b/spec/defines/ppa_spec.rb
index a05ca306452a8d08c48bd30cc706f40d18505cd5..dc1173b8970c3c88fc6cd8c01709c10dd6b5c917 100644 (file)
--- a/spec/defines/ppa_spec.rb
+++ b/spec/defines/ppa_spec.rb
@@ -2,9 +2,11 @@ require 'spec_helper'
 describe 'apt::ppa', :type => :define do
   [ { :lsbdistrelease => '11.04',
       :lsbdistcodename => 'natty',
+      :operatingsystem => 'Ubuntu',
       :package => 'python-software-properties'},
     { :lsbdistrelease => '12.10',
       :lsbdistcodename => 'quantal',
+      :operatingsystem => 'Ubuntu',
       :package => 'software-properties-common'},
   ].each do |platform|
     context "on #{platform[:lsbdistcodename]}" do
@@ -12,6 +14,7 @@ describe 'apt::ppa', :type => :define do
         {
           :lsbdistrelease => platform[:lsbdistrelease],
           :lsbdistcodename => platform[:lsbdistcodename],
+          :operatingsystem => platform[:operatingsystem],
         }
       end
       let :release do
@@ -109,7 +112,7 @@ describe 'apt::ppa', :type => :define do
     end
   end
 
-  [ { :lsbdistcodename => 'natty', 
+  [ { :lsbdistcodename => 'natty',
       :package => 'python-software-properties' },
     { :lsbdistcodename => 'quantal',
       :package => 'software-properties-common'},
@@ -121,7 +124,8 @@ describe 'apt::ppa', :type => :define do
            'package { "#{platform[:package]}": }->Apt::Ppa["ppa"]'
         end
         let :facts do
-          {:lsbdistcodename => '#{platform[:lsbdistcodename]}'}
+          {:lsbdistcodename => '#{platform[:lsbdistcodename]}',
+           :operatingsystem => 'Ubuntu'}
         end
         let(:title) { "ppa" }
         let(:release) { "#{platform[:lsbdistcodename]}" }