Changeset 27517 for branches/eam_branches/20100225/DataStoreServer/scripts/dsreg

Timestamp:

Mar 29, 2010, 3:55:49 PM (16 years ago)

Author:

eugene

Message:

update merges from trunk

Location:

branches/eam_branches/20100225

Files:

• . (modified) (1 prop)
• DataStoreServer/scripts/dsreg (modified) (1 diff)

branches/eam_branches/20100225/DataStoreServer/scripts/dsreg

@@ -356 +356 @@
                 die "file $path not found";
             }
-            if (!$file->{bytes}) {
-                my @finfo = stat($path);
-                unless (@finfo) {
-                    die ("can't stat $path");
+            # get the size of the file
+            my @finfo = stat($path);
+            unless (@finfo) {
+                die ("can't stat $path");
+            }
+            # if size was supplied make sure that it matches the actual
+            # size
+            if ($file->{bytes}) {
+                my $current_size = $finfo[7];
+                if ($file->{bytes} != $current_size) {
+                    die "size on disk: $current_size does not match supplied"
+                    . " size: $file->{bytes} for $path";
                 }
+            } else {
                 $file->{bytes}  = $finfo[7];
             }