X-Git-Url: http://git.vrable.net/?a=blobdiff_plain;f=restore.pl;h=53b48dc4e2e2922e5f008100c477e304f60e8744;hb=57890fff9773a368f241a25c89931a5d67fccb4e;hp=be94078f7fe869cc5080160e9549eab53c29c901;hpb=25dc252eb3c3db9fe48ffb074cd66aa37a216fbc;p=cumulus.git

diff --git a/restore.pl b/restore.pl
index be94078..53b48dc 100755
--- a/restore.pl
+++ b/restore.pl
@@ -166,7 +166,7 @@ sub iterate_objects {
         next if $obj eq "";
         if ($obj =~ /^@(\S+)$/) {
             my $indirect = load_ref($1);
-            iterate_objects($callback, $arg, $1, $recursion_level + 1);
+            iterate_objects($callback, $arg, $indirect, $recursion_level + 1);
         } else {
             &$callback($arg, $obj);
         }
@@ -272,8 +272,14 @@ sub process_file {
 
     my $uid = -1;
     my $gid = -1;
-    $uid = $info{user} + 0 if defined $info{user};
-    $gid = $info{group} + 0 if defined $info{group};
+    if (defined $info{user}) {
+        my @items = split /\s/, $info{user};
+        $uid = $items[0] + 0 if exists $items[0];
+    }
+    if (defined $info{group}) {
+        my @items = split /\s/, $info{group};
+        $gid = $items[0] + 0 if exists $items[0];
+    }
     chown $uid, $gid, $dest
         or warn "Unable to change ownership for $dest";