aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorRalph Amissah <ralph@amissah.com>2013-03-05 21:41:50 -0500
committerRalph Amissah <ralph@amissah.com>2013-03-05 21:41:52 -0500
commit4dd30e8ad1e3c0719dc2608278fe7ed5ccf3b627 (patch)
tree6ad55174d0dcd88d45c41ada521f0903175e76b3
parentv4: texpdf, report to STDERR when pdf not generated (Closes: #617359) (diff)
v4: sysenv, set default output (directory layout) type where none configured
* (also turned off reporting where imagemagick & graphicsmagick not installed)
-rw-r--r--data/doc/sisu/CHANGELOG_v43
-rw-r--r--lib/sisu/v4/sysenv.rb12
2 files changed, 11 insertions, 4 deletions
diff --git a/data/doc/sisu/CHANGELOG_v4 b/data/doc/sisu/CHANGELOG_v4
index 4f3c3a67..12a289a4 100644
--- a/data/doc/sisu/CHANGELOG_v4
+++ b/data/doc/sisu/CHANGELOG_v4
@@ -32,6 +32,9 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_4.0.10.orig.tar.xz
.tex file is almost certainly produced by sisu, this will be a sisu packaging,
texlive dependency issue, preventing its conversion to pdf (Closes: #617359)
+* v4: sysenv, set default output (directory layout) type where none configured
+ (also turned off reporting where imagemagick & graphicsmagick not installed)
+
%% 4.0.9.orig.tar.xz (2013-02-22:07/5)
http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.0.9
http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_4.0.9-1
diff --git a/lib/sisu/v4/sysenv.rb b/lib/sisu/v4/sysenv.rb
index 17acc872..c3f69c85 100644
--- a/lib/sisu/v4/sysenv.rb
+++ b/lib/sisu/v4/sysenv.rb
@@ -470,9 +470,11 @@ module SiSU_Env
or ((defined? @rc['output_structure']['by_filename']) \
&& @rc['output_structure']['by_filename'] ==true)
:filename
- else #recheck current default
+ else #set default
:language
end
+ else #set default
+ :language
end
end
def dump?
@@ -789,14 +791,14 @@ module SiSU_Env
program='identify'
program_ref="\n\t\tsee <http://www.imagemagick.org/>"
found=(program_found?(program)) ? true : false
- STDERR.puts "\t*WARN* #{program} is not installed #{program_ref}" unless found
+ #STDERR.puts "\t*WARN* #{program} is not installed #{program_ref}" unless found
found
end
def graphicksmagick #graphicsmagick is a image manipulation program
program='gm'
program_ref="\n\t\tsee <http://www.graphicsmagick.org/>"
found=(program_found?(program)) ? true : false
- STDERR.puts "\t*WARN* #{program} is not installed #{program_ref}" unless found
+ #STDERR.puts "\t*WARN* #{program} is not installed #{program_ref}" unless found
found
end
def well_formed? #tidy - check for well formed xml xhtml etc.
@@ -3487,6 +3489,7 @@ WOK
class InfoVersion <InfoEnv
include Singleton
require 'rbconfig'
+ require 'yaml'
@@lib_path=nil
def get_version
@version={}
@@ -3496,7 +3499,8 @@ WOK
: "#{defaults[:sisu_share]}/#{SiSU_version_dir}/v/version.yml"
lib_path=@@lib_path ? @@lib_path : `echo $RUBYLIB`.split(':')
@@lib_path ||=lib_path
- if File.exist?(yst_ver); @version=YAML::load(File::open(yst_ver)) #unless @@noyaml
+ if File.exist?(yst_ver)
+ @version=YAML::load(File::open(yst_ver)) #unless @@noyaml
end
@version
end