[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, master, updated. debian/0.24.6-1-356-g5718585

[James Turnbull]

The following commit has been merged in the master branch:
commit 8fe033820875966106ab3807aa34a1cafc85cbd2
Author: James Turnbull <james at lovedthanlost.net>
Date:   Fri Sep 5 11:39:57 2008 +1000

    Fixes #1554 - Fix exception for undefined hostname

diff --git a/CHANGELOG b/CHANGELOG
index 1ba297e..5b9ad4c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,6 @@
 0.24.x
+    Fixes #1554 - Fix exception for undefined hostname
+
     Fixed #1533 - changed permissions for man directory
 
     Added daemontools and runit providers for service type
diff --git a/lib/puppet/node.rb b/lib/puppet/node.rb
index afa18f5..341ec77 100644
--- a/lib/puppet/node.rb
+++ b/lib/puppet/node.rb
@@ -94,8 +94,10 @@ class Puppet::Node
 
         # First, get the fqdn
         unless fqdn = parameters["fqdn"]
-            if domain = parameters["domain"]
-                fqdn = parameters["hostname"] + "." + parameters["domain"]
+            if parameters["hostname"] and parameters["domain"]
+                 fqdn = parameters["hostname"] + "." + parameters["domain"]
+            else
+                 Puppet.warning "Host is missing hostname and/or domain: %s" % name
             end
         end
 

-- 
Puppet packaging for Debian