lib/fig/environment.rb in fig-0.1.11 vs lib/fig/environment.rb in fig-0.1.12

@@ -112,10 +112,10 @@
       package
     end
 
     # Replace @ symbol with the package's directory
     def expand_value(base_package, name, value)
-      return value if base_package.nil?
+      return value unless base_package && base_package.package_name
       file = value.gsub(/\@/, base_package.directory)
       if @retrieve_vars.member?(name)
         target = File.join(@retrieve_vars[name].gsub(/\[package\]/, base_package.package_name), File.basename(file))
         unless @os.exist?(target) && @os.mtime(target) >= @os.mtime(file)
           @os.log_info("retrieving #{target}")