osgeo4w: ignore rmdir result

qgis · Sep 25, 2013 · a95bd7d · a95bd7d
1 parent 067c1df
commit a95bd7d
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/ms-windows/osgeo4w/package-nightly.cmd b/ms-windows/osgeo4w/package-nightly.cmd
@@ -154,9 +154,10 @@ echo RUN_TESTS: %DATE% %TIME%>>%LOG% 2>&1
 %DEVENV% qgis%VERSION%.sln /Project Nightly /Build %BUILDCONF% /Out %LOG%>>%LOG% 2>&1
 REM if errorlevel 1 echo "TESTS WERE NOT SUCCESSFUL."
 
-echo RMDIR: %DATE% %TIME%>>%LOG% 2>&1
+if exist %OSGEO4W_ROOT%\apps\%PACKAGENAME% (
-rmdir /s /q %OSGEO4W_ROOT%\apps\%PACKAGENAME%
+	echo REMOVE: %DATE% %TIME%>>%LOG% 2>&1
-if errorlevel 1 goto error
+	rmdir /s /q %OSGEO4W_ROOT%\apps\%PACKAGENAME%
+)
 
 echo INSTALL: %DATE% %TIME%>>%LOG% 2>&1
 %DEVENV% qgis%VERSION%.sln /Project INSTALL /Build %BUILDCONF% /Out %LOG%>>%LOG% 2>&1

diff --git a/ms-windows/osgeo4w/package-nightly64.cmd b/ms-windows/osgeo4w/package-nightly64.cmd
@@ -151,9 +151,10 @@ echo RUN_TESTS: %DATE% %TIME%>>%LOG% 2>&1
 %DEVENV% qgis%VERSION%.sln /Project Nightly /Build %BUILDCONF% /Out %LOG%>>%LOG% 2>&1
 REM if errorlevel 1 echo "TESTS WERE NOT SUCCESSFUL."
 
-echo RMDIR: %DATE% %TIME%>>%LOG% 2>&1
+if exist %OSGEO4W_ROOT%\apps\%PACKAGENAME% (
-rmdir /s /q %OSGEO4W_ROOT%\apps\%PACKAGENAME%
+	echo REMOVE: %DATE% %TIME%>>%LOG% 2>&1
-if errorlevel 1 goto error
+	rmdir /s /q %OSGEO4W_ROOT%\apps\%PACKAGENAME%
+)
 
 echo INSTALL: %DATE% %TIME%>>%LOG% 2>&1
 %DEVENV% qgis%VERSION%.sln /Project INSTALL /Build %BUILDCONF% /Out %LOG%>>%LOG% 2>&1

diff --git a/ms-windows/osgeo4w/package.cmd b/ms-windows/osgeo4w/package.cmd
@@ -150,7 +150,6 @@ if errorlevel 1 goto error
 if exist %OSGEO4W_ROOT%\apps\%PACKAGENAME% (
 	echo REMOVE: %DATE% %TIME%>>%LOG% 2>&1
 	rmdir /s /q %OSGEO4W_ROOT%\apps\%PACKAGENAME%
-	if errorlevel 1 goto error
 )
 
 echo INSTALL: %DATE% %TIME%>>%LOG% 2>&1

diff --git a/ms-windows/osgeo4w/package64.cmd b/ms-windows/osgeo4w/package64.cmd
@@ -146,7 +146,6 @@ if errorlevel 1 goto error
 if exist %OSGEO4W_ROOT%\apps\%PACKAGENAME% (
 	echo REMOVE: %DATE% %TIME%>>%LOG% 2>&1
 	rmdir /s /q %OSGEO4W_ROOT%\apps\%PACKAGENAME%
-	if errorlevel 1 goto error
 )
 
 echo INSTALL: %DATE% %TIME%>>%LOG% 2>&1