aboutsummaryrefslogtreecommitdiffhomepage
path: root/lib/sisu
diff options
context:
space:
mode:
authorRalph Amissah <ralph@amissah.com>2009-08-02 11:59:45 -0400
committerRalph Amissah <ralph@amissah.com>2009-08-02 11:59:45 -0400
commitf3dedbbf8fc3e50ad649f8865521079f1e4ef6de (patch)
tree217f126cbdf45cfee5f0f35501608c6fd369a378 /lib/sisu
parentdebian/changelog sisu (0.71.1-1) unstable; urgency=low (diff)
parentsysenv sha256 fix, set pwd (diff)
Merge branch 'upstream' into debian/sid
Diffstat (limited to 'lib/sisu')
-rw-r--r--lib/sisu/v1/html_segments.rb1
-rw-r--r--lib/sisu/v1/sysenv.rb1
2 files changed, 2 insertions, 0 deletions
diff --git a/lib/sisu/v1/html_segments.rb b/lib/sisu/v1/html_segments.rb
index d874063a..66e04800 100644
--- a/lib/sisu/v1/html_segments.rb
+++ b/lib/sisu/v1/html_segments.rb
@@ -201,6 +201,7 @@ module SiSU_HTML_seg
Seg_output.new(@md,@output_seg_file,@@seg,@minitoc,'endnotes').output
elsif @@seg_name_html[tracking-1] =~/idx/
Seg_output.new(@md,@output_seg_file,@@seg,@minitoc,'idx').output
+ @@seg[:idx]=[]
else p 'check'
end
Seg.new.reinitialise
diff --git a/lib/sisu/v1/sysenv.rb b/lib/sisu/v1/sysenv.rb
index c3c2a0ee..8d4636c1 100644
--- a/lib/sisu/v1/sysenv.rb
+++ b/lib/sisu/v1/sysenv.rb
@@ -612,6 +612,7 @@ module SiSU_Env
program='openssl'
program_ref="\n\t\tsha digest requested"
if program_found?(program)
+ pwd=Dir.pwd
Dir.chdir(File.dirname(filename))
dgst=%x{openssl dgst -sha256 #{File.basename(filename)}}.strip #use file name without file path
Dir.chdir(pwd)