From b05ae2ae1262469df264e3a35b30f7a1d1805c18 Mon Sep 17 00:00:00 2001
From: lutter <lutter@980ebf18-57e1-0310-9a29-db15c13687c0>
Date: Fri, 9 Mar 2007 01:40:35 +0000
Subject: Don't blow up when PUPPETLIB isn't set

git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2280 980ebf18-57e1-0310-9a29-db15c13687c0
---
 lib/puppet/modules.rb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/puppet/modules.rb b/lib/puppet/modules.rb
index b1b8804ea..5e7868cb5 100644
--- a/lib/puppet/modules.rb
+++ b/lib/puppet/modules.rb
@@ -9,7 +9,10 @@ class Puppet::Module
     # parameter. Only consider paths that are absolute and existing
     # directories
     def self.modulepath
-        dirs = ENV["PUPPETLIB"].split(":") + Puppet[:modulepath].split(":")
+        dirs = Puppet[:modulepath].split(":")
+        if ENV["PUPPETLIB"]
+            dirs = ENV["PUPPETLIB"].split(":") + dirs
+        end
         dirs.select do |p|
             p =~ /^#{File::SEPARATOR}/ && File::directory?(p)
         end
-- 
cgit