Changeset 27840 for branches/simtest_nebulous_branches/DataStore/scripts/dsfilesetls

Timestamp:

May 3, 2010, 8:50:52 AM (16 years ago)

Author:

eugene

Message:

updates from trunk

Location:

branches/simtest_nebulous_branches

Files:

• . (modified) (1 prop)
• DataStore/scripts/dsfilesetls (modified) (3 diffs)

branches/simtest_nebulous_branches/DataStore/scripts/dsfilesetls

@@ -16 +16 @@
 use Pod::Usage qw( pod2usage );
 
-my ($uri, $timeout);
+my ($uri, $timeout, $no_proxy);
 
 GetOptions(
     'uri|u=s'           => \$uri,
     'timeout|t=s'       => \$timeout,
+    'no-proxy'          => \$no_proxy,
 ) or pod2usage( 2 );
 
@@ -31 +32 @@
 # default http request timeout is 30s
 $timeout ||= 30;
+$no_proxy = 0 if !defined $no_proxy;
+
+if (!($uri =~ /\/index\.txt$/)) {
+    $uri .= '/index.txt'
+} 
 
 my $response = DataStore::FileSet->new( uri => $uri )->request(
         ua_args  => { timeout => $timeout },
+        no_proxy => $no_proxy,
     );
 
@@ -91 +98 @@
 Optional.
 
+=item * --no-proxy
+
+Do not load proxy environment variables.
+
+Optional.
+
 =back