Changeset 32694 for branches/eam_branches/ipp-20111110/PS-IPP-Config/lib/PS/IPP/Config.pm

Timestamp:

Nov 17, 2011, 2:02:08 PM (15 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20111110

Files:

• . (modified) (1 prop)
• PS-IPP-Config/lib/PS/IPP/Config.pm (modified) (1 diff)

branches/eam_branches/ipp-20111110/PS-IPP-Config/lib/PS/IPP/Config.pm

@@ -398 +398 @@
     return $self->{nebulous} if defined $self->{nebulous}; # Already started
 
-    my $server = metadataLookupStr( $self->{_siteConfig}, 'NEB_SERVER' ); # Nebulous server
+    # For consistency with the rest of the IPP, don't use site.config
+    # to set NEB_SERVER use environment variable.
+    # my $server = metadataLookupStr( $self->{_siteConfig}, 'NEB_SERVER' ); # Nebulous server
+    my $server = $ENV{NEB_SERVER};
     unless (defined $server) {
         carp "Unable to find NEB_SERVER in camera configuration file.";