Changeset 25027 for branches/pap/DataStore/scripts/dsget

Timestamp:

Aug 7, 2009, 4:08:25 PM (17 years ago)

Author:

Paul Price

Message:

Merging trunk (r25026) to get up-to-date on old branch.

Location:

branches/pap

Files:

• . (modified) (1 prop)
• DataStore/scripts/dsget (modified) (9 diffs)

branches/pap/DataStore/scripts/dsget

@@ -1 +1 @@
 #!/usr/bin/env perl
 
-# Copyright (C) 2006-2008  Joshua Hoblitt
-#
-# $Id: dsget,v 1.35 2008-09-24 21:58:03 jhoblitt Exp $
+# Copyright (C) 2006-2009  Joshua Hoblitt
 
 use strict;
@@ -9 +7 @@
 
 use vars qw( $VERSION );
-$VERSION = '0.02';
+$VERSION = '0.03';
 
 use DataStore;
@@ -28 +26 @@
     $server,
     $compress,
-    $timeout
+    $timeout,
+    @xattrs,
 );
 
@@ -43 +42 @@
     'filename|f=s'  => \$filename,
     'compress|c'    => \$compress,
-    'timeout|t=s'     => \$timeout,
+    'timeout|t=s'   => \$timeout,
+    'xattr|x=s'     => \@xattrs,
 ) or pod2usage( 2 );
 
@@ -159 +159 @@
     require Nebulous::Client;
     import Nebulous::Client;
+    require Nebulous::Util;
+    import Nebulous::Util qw( :standard );
     require File::Copy;
     import File::Copy;
@@ -188 +190 @@
         or die "Nebulous can't set xattr on key $filename";
 
+    if (scalar @xattrs) {
+        write_xattrs($neb, $filename, @xattrs)
+            or die "Nebulous set xattrs on key $filename";
+    }
+
     open(my $src_fh, $tmpfilename) or die "can't open file $tmpfilename: $!";
 
@@ -230 +237 @@
 
     dsget --uri <uri> --filename <filename> [--bytes <nbytes>] [--md5 <hex>]
-        [--compress] [--nebulous] [--volume <volume name>] [--copies <n>]
+        [--compress] [--nebulous] [--xattr user.<name>:<value>]
+        [--volume <volume name>] [--copies <n>]
 
 =head1 DESCRIPTION
@@ -265 +273 @@
 Optional.
 
+=item * --xattr|-x
+
+Flag to set a Nebulous xattr on C<--filename>.  Can be specified more than
+once.
+
+Optional.
+
 =item * --compress|-c
 
@@ -306 +321 @@
 =head1 COPYRIGHT
 
-Copyright (C) 2006-2008  Joshua Hoblitt.  All rights reserved.
+Copyright (C) 2006-2009  Joshua Hoblitt.  All rights reserved.
 
 This program is free software; you can redistribute it and/or modify it under