From 419021fb2e3aa73ebc625bf623d70a4e8d281787 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20M=E4kinen?= <tmakinen@foo.sh>
Date: Wed, 4 Jul 2012 02:08:35 +0300
Subject: [PATCH] Fixed some puppet-lint errors.

---
 daap/manifests/init.pp  | 3 +--
 emacs/manifests/init.pp | 2 +-
 skype/manifests/init.pp | 4 ++--
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/daap/manifests/init.pp b/daap/manifests/init.pp
index d9b1df6..632d56a 100644
--- a/daap/manifests/init.pp
+++ b/daap/manifests/init.pp
@@ -12,8 +12,7 @@ class daap::server {
     service { "mt-daapd":
         ensure  => running,
         enable  => true,
-        require => [ Package["mt-daapd"],
-                     Service["avahi-daemon"], ],
+        require => [ Package["mt-daapd"], Service["avahi-daemon"], ],
     }
 
     file { "/etc/mt-daapd.conf":
diff --git a/emacs/manifests/init.pp b/emacs/manifests/init.pp
index c9f45b2..a0f8e46 100644
--- a/emacs/manifests/init.pp
+++ b/emacs/manifests/init.pp
@@ -7,7 +7,7 @@ class emacs {
         ensure => installed,
     }
 
-    if $puppetversion =~ /^2\./ {
+    if $::puppetversion =~ /^2\./ {
         Package["emacs"] {
             flavor => "no_x11",
         }
diff --git a/skype/manifests/init.pp b/skype/manifests/init.pp
index bb016da..f7458ee 100644
--- a/skype/manifests/init.pp
+++ b/skype/manifests/init.pp
@@ -3,10 +3,10 @@
 #
 class skype {
 
-    case $operatingsystem {
+    case $::operatingsystem {
         "fedora": { include yum::repo::skype }
         "ubuntu": { include apt::repo::partner }
-        default: { fail("Skype module not supported in ${operatingsystem}") }
+        default: { fail("Skype module not supported in ${::operatingsystem}") }
     }
 
     package { "skype":