From: Stephen Gran <steve@lobefin.net>
Date: Thu, 5 Apr 2012 14:30:36 +0000 (+0100)
Subject: s/err/fail/
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=175c9bc26de888ba32a7677aa393621425d595f5;p=mirror%2Fdsa-puppet.git

s/err/fail/

Signed-off-by: Stephen Gran <steve@lobefin.net>
---

diff --git a/modules/apache2/manifests/config.pp b/modules/apache2/manifests/config.pp
index 5d5170046..b67ddbee7 100644
--- a/modules/apache2/manifests/config.pp
+++ b/modules/apache2/manifests/config.pp
@@ -2,14 +2,14 @@ define apache2::config($config = undef, $template = undef, $ensure = present) {
 
 	include apache2
 
-	if ! ($config or $template) {
-		err ( "No configuration found for ${name}" )
-	}
-
 	case $ensure {
-		present: {}
+		present: {
+			if ! ($config or $template) {
+				fail ( "No configuration found for ${name}" )
+			}
+		}
 		absent:  {}
-		default: { err ( "Unknown ensure value: '$ensure'" ) }
+		default: { fail ( "Unknown ensure value: '$ensure'" ) }
 	}
 
 	if $template {
diff --git a/modules/apache2/manifests/module.pp b/modules/apache2/manifests/module.pp
index 3a6922bd3..17d4a71a0 100644
--- a/modules/apache2/manifests/module.pp
+++ b/modules/apache2/manifests/module.pp
@@ -12,6 +12,6 @@ define apache2::module ($ensure = present) {
 				notify => Service['apache2']
 			}
 		}
-		default: { err ( "Unknown ensure value: '$ensure'" ) }
+		default: { fail ( "Unknown ensure value: '$ensure'" ) }
 	}
 }
diff --git a/modules/apache2/manifests/site.pp b/modules/apache2/manifests/site.pp
index 263c6d8a6..8fa5fdf52 100644
--- a/modules/apache2/manifests/site.pp
+++ b/modules/apache2/manifests/site.pp
@@ -7,8 +7,10 @@ define apache2::site (
 
 	include apache2
 
-	if ! ($config or $template) {
-		err ( "No configuration found for ${name}" )
+	if $ensure == present {
+		if ! ($config or $template) {
+			fail ( "No configuration found for ${name}" )
+		}
 	}
 
 	if $site {
@@ -22,7 +24,7 @@ define apache2::site (
 	$link_target = $ensure ? {
 		present => $target,
 		absent  => absent,
-		default => err ( "Unknown ensure value: '$ensure'" ),
+		default => fail ( "Unknown ensure value: '$ensure'" ),
 	}
 
 	case $template {
diff --git a/modules/munin/manifests/check.pp b/modules/munin/manifests/check.pp
index d807861fe..ace6bb52e 100644
--- a/modules/munin/manifests/check.pp
+++ b/modules/munin/manifests/check.pp
@@ -11,7 +11,7 @@ define munin::check($ensure = present, $script = undef) {
 	$link_target = $ensure ? {
 		present => "/usr/share/munin/plugins/${link}",
 		absent  => absent,
-		default => err ( "Unknown ensure value: '$ensure'" ),
+		default => fail ( "Unknown ensure value: '$ensure'" ),
 	}
 
 	file { "/etc/munin/plugins/${name}":
diff --git a/modules/site/manifests/alternative.pp b/modules/site/manifests/alternative.pp
index 94d088818..c207df882 100644
--- a/modules/site/manifests/alternative.pp
+++ b/modules/site/manifests/alternative.pp
@@ -12,6 +12,6 @@ define site::alternative ($linkto, $ensure = present) {
 					unless => "[ $(update-alternatives --query ${name} | grep ^Value | awk '{print \$2}') != ${linkto} ]",
 			}
 		}
-		default: { err ( "Unknown ensure value: '$ensure'" ) }
+		default: { fail ( "Unknown ensure value: '$ensure'" ) }
 	}
 }
diff --git a/modules/site/manifests/aptrepo.pp b/modules/site/manifests/aptrepo.pp
index d461807af..79d1a59c6 100644
--- a/modules/site/manifests/aptrepo.pp
+++ b/modules/site/manifests/aptrepo.pp
@@ -16,11 +16,13 @@ define site::aptrepo ($key = undef, $template = undef, $config = undef, $ensure
 	case $ensure {
 		present: {}
 		absent:  {}
-		default: { err ( "Unknown ensure value: '$ensure'" ) }
+		default: { fail ( "Unknown ensure value: '$ensure'" ) }
 	}
 
-	if ! ($template or $config) {
-		err ( "Can't find configuration for ${name}" )
+	if $ensure == present {
+		if ! ($config or $template) {
+			fail ( "No configuration found for ${name}" )
+		}
 	}
 
 	if $template {
diff --git a/modules/site/manifests/linux_module.pp b/modules/site/manifests/linux_module.pp
index 8a81c6c0e..36c09dcf3 100644
--- a/modules/site/manifests/linux_module.pp
+++ b/modules/site/manifests/linux_module.pp
@@ -13,9 +13,7 @@ define site::linux_module ($ensure = present) {
 					onlyif => "grep -q -F -x '${name}' /etc/modules",
 				}
 			}
-			default: {
-				err("invalid ensure value ${ensure}")
-			}
+			default: { fail ("invalid ensure value ${ensure}") }
 		}
 	}
 }
diff --git a/modules/site/manifests/sysctl.pp b/modules/site/manifests/sysctl.pp
index 9786c8e50..ac357a7cb 100644
--- a/modules/site/manifests/sysctl.pp
+++ b/modules/site/manifests/sysctl.pp
@@ -3,7 +3,7 @@ define site::sysctl ($key, $value, $ensure = present) {
 	case $ensure {
 		present: {}
 		absent:  {}
-		default: { err ( "Unknown ensure value: '$ensure'" ) }
+		default: { fail ( "Unknown ensure value: '$ensure'" ) }
 	}
 
 	file {