[evolvis-commits] r18422: frs-download-as-zip pending merges:↵ Thorsten Glaser 2012-05-23 do not terminate createNewestReleaseFilesAsZip with exit_error

mirabilos at evolvis.org mirabilos at evolvis.org
Wed May 23 17:17:43 CEST 2012


Author: mirabilos
Date: 2012-05-23 17:17:42 +0200 (Wed, 23 May 2012)
New Revision: 18422

Modified:
   trunk/gforge_base/evolvisforge-5.1/src/common/frs/FRSPackage.class.php
Log:
frs-download-as-zip pending merges:
  Thorsten Glaser 2012-05-23 do not terminate createNewestReleaseFilesAsZip with exit_error

Modified: trunk/gforge_base/evolvisforge-5.1/src/common/frs/FRSPackage.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/common/frs/FRSPackage.class.php	2012-05-21 09:53:40 UTC (rev 18421)
+++ trunk/gforge_base/evolvisforge-5.1/src/common/frs/FRSPackage.class.php	2012-05-23 15:17:42 UTC (rev 18422)
@@ -518,8 +518,9 @@
 			    is_link($filePath) ||
 			    !is_file($filePath) ||
 			    !is_readable($filePath)) {
-				exit_error(sprintf(_('"%s" is not a readable regular file'),
-				    $filePath), 'frs');
+				return; /* this method is only called from backend code */
+				//exit_error(sprintf(_('"%s" is not a readable regular file'),
+				//    $filePath), 'frs');
 			}
 
 			/*
@@ -533,27 +534,31 @@
 			$fsz = filesize($filePath);
 
 			if ($fsz > 16777216) {
-				exit_error(sprintf(_('"%s" is bigger than 16 MiB, will not archive such huge files'),
-				    $filePath), 'frs');
+				return; /* this method is only called from backend code */
+				//exit_error(sprintf(_('"%s" is bigger than 16 MiB, will not archive such huge files'),
+				//    $filePath), 'frs');
 			}
 
 			$tsz += $fsz;
 			if ($tsz > 67108864) {
-				exit_error(_('Will not archive files with a total of more than 64 MiB size'),
-				    'frs');
+				return; /* this method is only called from backend code */
+				//exit_error(_('Will not archive files with a total of more than 64 MiB size'),
+				//    'frs');
 			}
 		}
 
 		@unlink($zipPath);
 		if (file_exists($zipPath)) {
-			exit_error(sprintf(_('Cannot delete old version of the file "%s"'),
-			    $zipPath), 'frs');
+			return; /* this method is only called from backend code */
+			//exit_error(sprintf(_('Cannot delete old version of the file "%s"'),
+			//    $zipPath), 'frs');
 		}
 
 		if ($zip->open($zipPath, ZIPARCHIVE::CREATE |
 		    ZIPARCHIVE::OVERWRITE) !== true) {
-			exit_error(sprintf(_('Cannot open the file archive "%s"'),
-			    $zipPath), 'frs');
+			return; /* this method is only called from backend code */
+			//exit_error(sprintf(_('Cannot open the file archive "%s"'),
+			//    $zipPath), 'frs');
 		}
 
 
@@ -585,5 +590,3 @@
 // mode: php
 // c-file-style: "bsd"
 // End:
-
-?>



More information about the evolvis-commits mailing list