v5 v6: hub, /tmp processing directory checks
authorRalph Amissah <ralph@amissah.com>
Sat, 13 Sep 2014 01:14:32 +0000 (21:14 -0400)
committerRalph Amissah <ralph@amissah.com>
Sat, 13 Sep 2014 01:14:32 +0000 (21:14 -0400)
data/doc/sisu/CHANGELOG_v5
data/doc/sisu/CHANGELOG_v6
lib/sisu/v5/hub.rb
lib/sisu/v6/hub.rb

index 9063be711d9a2d3c500cb7c983e772d9901420fe..185bc6ed89b19d8639fe3defb8c74eebfa58e18c 100644 (file)
@@ -38,6 +38,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_5.6.6.orig.tar.xz
   sisu_5.6.6.orig.tar.xz
   sisu_5.6.6-1.dsc
 
+* hub, /tmp processing directory checks
+
 %% 5.6.5.orig.tar.xz (2014-09-05:35/5)
 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.6.5
 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.6.5-1
index 10f521e568f6beb72e9f01c9ff3e78dd6ba849a6..c5d5c646d5817b691b07cbf44b32591023a853be 100644 (file)
@@ -28,6 +28,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_6.2.7.orig.tar.xz
   sisu_6.2.7.orig.tar.xz
   sisu_6.2.7-1.dsc
 
+* hub, /tmp processing directory checks
+
 %% 6.2.6.orig.tar.xz (2014-09-05:35/5)
 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_6.2.6
 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_6.2.6-1
index eda98084db98f3a8748232549939fe8965620b2a..0e90f21a3cd1d98c656f1e2e7edca545ce692556 100644 (file)
@@ -266,6 +266,8 @@ module SiSU
       rescue
       ensure
         if FileTest.directory?(@env.processing_path.processing) \
+        and FileTest.directory?(@env.processing_path.processing_base_tmp) \
+        and @env.processing_path.processing_base_tmp =~/#{@env.processing_path.processing}/ \
         and @env.processing_path.processing_base_tmp =~/^\/tmp\/\S+/
           FileUtils::cd(@env.processing_path.processing_base_tmp) do
             FileUtils::rm_rf('.')
index 2558a9dbc3f291695cb75257f3c0a53c6ffae4d8..41f8e9301ce72ae31f20dc0703c36ef5088c8a37 100644 (file)
@@ -266,6 +266,8 @@ module SiSU
       rescue
       ensure
         if FileTest.directory?(@env.processing_path.processing) \
+        and FileTest.directory?(@env.processing_path.processing_base_tmp) \
+        and @env.processing_path.processing_base_tmp =~/#{@env.processing_path.processing}/ \
         and @env.processing_path.processing_base_tmp =~/^\/tmp\/\S+/
           FileUtils::cd(@env.processing_path.processing_base_tmp) do
             FileUtils::rm_rf('.')