use cases rather than if + indentation

chrisboulton · Jun 9, 2010 · dcb2518 · dcb2518
1 parent 3712f50
commit dcb2518
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 28 deletions.
diff --git a/manifests/classes/apt.pp b/manifests/classes/apt.pp
@@ -4,20 +4,22 @@
   }
 
   # apt support preferences.d since version >= 0.7.22
-  if $lsbdistcodename == "lucid" {
+  case $lsbdistcodename { 
+    lucid : {
 
-    file {"/etc/apt/preferences":
-      ensure => absent,
-    }
+      file {"/etc/apt/preferences":
+        ensure => absent,
+      }
 
-    file {"/etc/apt/preferences.d":
-      ensure => directory,
-      owner => root,
-      group => root,
-      mode => 755,
-      recurse => true,
-      purge => true,
-      force => true,
+      file {"/etc/apt/preferences.d":
+        ensure  => directory,
+        owner   => root,
+        group   => root,
+        mode    => 755,
+        recurse => true,
+        purge   => true,
+        force   => true,
+      }
     }
   }
 

diff --git a/manifests/definitions/preferences.pp b/manifests/definitions/preferences.pp
@@ -8,23 +8,26 @@
   notice "version: $lsbdistcodename"
 
   # apt support preferences.d since version >= 0.7.22
-  if $lsbdistcodename == "lucid" {
-    file {"/etc/apt/preferences.d/$name":
-      ensure => $ensure,
-      owner => root,
-      group => root,
-      mode => 644,
-      content => template("apt/preferences.erb"),
-      before  => Exec["apt-get_update"],
+  case $lsbdistcodename {
+    lucid : {   
+      file {"/etc/apt/preferences.d/$name":
+        ensure  => $ensure,
+        owner   => root,
+        group   => root,
+        mode    => 644,
+        content => template("apt/preferences.erb"),
+        before  => Exec["apt-get_update"],
+      }
+
     }
-  } else {
-    common::concatfilepart { $name:
-      ensure  => $ensure,
-      manage  => true,
-      file    => "/etc/apt/preferences",
-      content => template("apt/preferences.erb"),
-      before  => Exec["apt-get_update"],
+    default: {
+      common::concatfilepart { $name:
+        ensure  => $ensure,
+        manage  => true,
+        file    => "/etc/apt/preferences",
+        content => template("apt/preferences.erb"),
+        before  => Exec["apt-get_update"],
+      }
     }
   }
-
 }