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

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/dsget (modified) (9 diffs)

branches/simtest_nebulous_branches/DataStore/scripts/dsget

@@ -28 +28 @@
     $timeout,
     @xattrs,
+    $no_proxy,
 );
 
@@ -44 +45 @@
     'timeout|t=s'   => \$timeout,
     'xattr|x=s'     => \@xattrs,
+    'no-proxy'      => \$no_proxy,
 ) or pod2usage( 2 );
 
@@ -69 +71 @@
         undef $copies;
     }
-    if ($copies < 1) {
+    elsif ($copies < 1) {
         die "--copies must be >= 1";
     }
@@ -80 +82 @@
 # default http request timeout is 30s
 $timeout ||= 30;
+$no_proxy = 0 if !defined $no_proxy;
 
 my %p = (
@@ -140 +143 @@
         filename => $tmpfilename,
         ua_args  => { timeout => $timeout },
+        no_proxy => $no_proxy,
     );
 
@@ -207 +211 @@
     if (defined $copies and $copies > 1) {
         foreach (1 .. ($copies - 1)) {
-            $neb->replicate($filename, 'any')
+            $neb->replicate($filename)
                 or die "failed to replicate $filename failed: $!";
         }
@@ -214 +218 @@
     $tmp->flush or die "can't flush filehandle: $!";
     $tmp->sync or die "can't sync filehandle: $!";
+    # set read and write permissions based on umask (ignore other bits)
+    my $umask = umask;
+    chmod 0666 ^ $umask, $tmpfilename or die "failed to chmod $tmpfilename";
     rename $tmpfilename, $filename
         or die "renaming $tmpfilename to $filename failed: $!";
@@ -232 +239 @@
 =head1 NAME
 
-gsget - download a file from a DataStore server
+dsget - download a file from a DataStore server
 
 =head1 SYNOPSIS
@@ -296 +303 @@
 The ammount of time (in seconds) to wait for a response from the DataStore
 after making an HTTP request.  The default is 30s.
+
+Optional.
+
+=item * --no-proxy
+
+Do not load proxy environment variables.
 
 Optional.