aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorRalph Amissah <ralph@amissah.com>2014-09-12 21:14:32 -0400
committerRalph Amissah <ralph@amissah.com>2014-09-12 21:14:32 -0400
commit57f76ceb65f06e21ee340724c4be45bdc78897d9 (patch)
tree437eab838d405122b0999a98173fda2c4014d2df
parentv5 v6: version & changelog (diff)
v5 v6: hub, /tmp processing directory checks
-rw-r--r--data/doc/sisu/CHANGELOG_v52
-rw-r--r--data/doc/sisu/CHANGELOG_v62
-rw-r--r--lib/sisu/v5/hub.rb2
-rw-r--r--lib/sisu/v6/hub.rb2
4 files changed, 8 insertions, 0 deletions
diff --git a/data/doc/sisu/CHANGELOG_v5 b/data/doc/sisu/CHANGELOG_v5
index 9063be71..185bc6ed 100644
--- a/data/doc/sisu/CHANGELOG_v5
+++ b/data/doc/sisu/CHANGELOG_v5
@@ -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
diff --git a/data/doc/sisu/CHANGELOG_v6 b/data/doc/sisu/CHANGELOG_v6
index 10f521e5..c5d5c646 100644
--- a/data/doc/sisu/CHANGELOG_v6
+++ b/data/doc/sisu/CHANGELOG_v6
@@ -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
diff --git a/lib/sisu/v5/hub.rb b/lib/sisu/v5/hub.rb
index eda98084..0e90f21a 100644
--- a/lib/sisu/v5/hub.rb
+++ b/lib/sisu/v5/hub.rb
@@ -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('.')
diff --git a/lib/sisu/v6/hub.rb b/lib/sisu/v6/hub.rb
index 2558a9db..41f8e930 100644
--- a/lib/sisu/v6/hub.rb
+++ b/lib/sisu/v6/hub.rb
@@ -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('.')