Fix an I/O wrapping problem with checking for broken file assets and storage locations.

perlDreamer · perlDreamer · commit 604887ff6607 · 2012-04-02T11:09:53.000-07:00
diff --git a/sbin/findBrokenAssets.pl b/sbin/findBrokenAssets.pl
@@ -253,15 +253,15 @@ sub progress {
         my $file_asset = eval { $get_asset->() };
         if ( $@ || Exception::Class->caught() ) {
             ##Do nothing, since it would have been caught above
-            printf "\r%-68s", "No asset to check";
+            printf "\r%-68s\n", "No asset to check";
         }
         elsif (!$file_asset) {
             last FILE_ASSET
         }
         else {
             my $storage = $file_asset->getStorageLocation;
             if (! $storage) {
-                printf "\r%-s", "-- No storage location: ".$file_asset->getId." storageId: ".$file_asset->get('storageId');
+                printf "\r%-s\n", "-- No storage location: ".$file_asset->getId." storageId: ".$file_asset->get('storageId');
             }
             else {
                 my $file = $storage->getPath($file_asset->get('filename'));
@@ -276,9 +276,9 @@ sub progress {
                             print "Could not purge File Asset";
                         }
                     }
+                    print "\n";
                 }
             }
-            print "\n";
         }
         progress( $file_assets, $count++ ) unless $no_progress;
     }

Original file line number	Diff line number	Diff line change
`@@ -253,15 +253,15 @@ sub progress {`
`253`	`253`	`my $file_asset = eval { $get_asset->() };`
`254`	`254`	`if ( $@ \|\| Exception::Class->caught() ) {`
`255`	`255`	`##Do nothing, since it would have been caught above`
`256`		`- printf "\r%-68s", "No asset to check";`
	`256`	`+ printf "\r%-68s\n", "No asset to check";`
`257`	`257`	`}`
`258`	`258`	`elsif (!$file_asset) {`
`259`	`259`	`last FILE_ASSET`
`260`	`260`	`}`
`261`	`261`	`else {`
`262`	`262`	`my $storage = $file_asset->getStorageLocation;`
`263`	`263`	`if (! $storage) {`
`264`		`- printf "\r%-s", "-- No storage location: ".$file_asset->getId." storageId: ".$file_asset->get('storageId');`
	`264`	`+ printf "\r%-s\n", "-- No storage location: ".$file_asset->getId." storageId: ".$file_asset->get('storageId');`
`265`	`265`	`}`
`266`	`266`	`else {`
`267`	`267`	`my $file = $storage->getPath($file_asset->get('filename'));`
`@@ -276,9 +276,9 @@ sub progress {`
`276`	`276`	`print "Could not purge File Asset";`
`277`	`277`	`}`
`278`	`278`	`}`
	`279`	`+ print "\n";`
`279`	`280`	`}`
`280`	`281`	`}`
`281`		`- print "\n";`
`282`	`282`	`}`
`283`	`283`	`progress( $file_assets, $count++ ) unless $no_progress;`
`284`	`284`	`}`