diff options
30 files changed, 60 insertions, 6 deletions
diff --git a/data/doc/sisu/CHANGELOG_v5 b/data/doc/sisu/CHANGELOG_v5 index 88d7f08d..e3646e86 100644 --- a/data/doc/sisu/CHANGELOG_v5 +++ b/data/doc/sisu/CHANGELOG_v5 @@ -38,6 +38,9 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_5.5.5.orig.tar.xz sisu_5.5.5.orig.tar.xz sisu_5.5.5-1.dsc +* ensure reset of parsed document directory path + * needed in the case of html for some subsequent processing + %% 5.5.4.orig.tar.xz (2014-07-24:29/4) http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.5.4 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.5.4-1 diff --git a/data/doc/sisu/CHANGELOG_v6 b/data/doc/sisu/CHANGELOG_v6 index 1e373983..cc2f9321 100644 --- a/data/doc/sisu/CHANGELOG_v6 +++ b/data/doc/sisu/CHANGELOG_v6 @@ -26,6 +26,9 @@ http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_6.1.5 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_6.1.5-1 http://www.jus.uio.no/sisu/pkg/src/sisu_6.1.5.orig.tar.xz +* ensure reset of parsed document directory path + * needed in the case of html for some subsequent processing + %% 6.1.4.orig.tar.xz (2014-07-24:29/4) http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_6.1.4 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_6.1.4-1 diff --git a/lib/sisu/v5/dbi_discrete.rb b/lib/sisu/v5/dbi_discrete.rb index a2aa3d09..9c4726c9 100644 --- a/lib/sisu/v5/dbi_discrete.rb +++ b/lib/sisu/v5/dbi_discrete.rb @@ -160,6 +160,8 @@ module SiSU_DBI_Discrete #% database building @conn=@db.sqlite.conn_sqlite3 rescue LoadError SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:fuchsia).error('sqlite3 not available') + ensure + Dir.chdir(@opt.f_pth[:pth]) end end end diff --git a/lib/sisu/v5/html.rb b/lib/sisu/v5/html.rb index 13aaf58d..526b41c6 100644 --- a/lib/sisu/v5/html.rb +++ b/lib/sisu/v5/html.rb @@ -91,6 +91,7 @@ module SiSU_HTML ensure SiSU_Env::CreateSite.new(@opt).cp_css SiSU_Env::CreateSite.new(@opt).cp_base_images + Dir.chdir(@opt.f_pth[:pth]) end end def songsheet diff --git a/lib/sisu/v5/html_concordance.rb b/lib/sisu/v5/html_concordance.rb index f336937f..7bbb1a4c 100644 --- a/lib/sisu/v5/html_concordance.rb +++ b/lib/sisu/v5/html_concordance.rb @@ -123,6 +123,7 @@ module SiSU_Concordance end ensure SiSU_Env::CreateSite.new(@opt).cp_css + Dir.chdir(@opt.f_pth[:pth]) end end private diff --git a/lib/sisu/v5/manifest.rb b/lib/sisu/v5/manifest.rb index faca95af..1afe1deb 100644 --- a/lib/sisu/v5/manifest.rb +++ b/lib/sisu/v5/manifest.rb @@ -121,6 +121,7 @@ module SiSU_Manifest end ensure SiSU_Env::CreateSite.new(@opt).cp_css + Dir.chdir(@opt.f_pth[:pth]) end end private diff --git a/lib/sisu/v5/manpage.rb |