diff options
| author | Ralph Amissah <ralph@amissah.com> | 2011-09-13 19:17:19 -0400 |
|---|---|---|
| committer | Ralph Amissah <ralph@amissah.com> | 2011-09-13 19:17:19 -0400 |
| commit | 403a52d7c62e4bb5ea6a0534b4062c57384dc3b3 (patch) | |
| tree | aceaab99b2ea785e7c72c2071281812d88bdb25e | |
| parent | v3: hub (affecting options +others) sisupod processing (v2 enabled) (diff) | |
v3: dal_images, disabled imagemagick configuration permission check
* until sisupod reads local sisurc.yml (configuration file)
| -rw-r--r-- | data/doc/sisu/CHANGELOG_v3 | 3 | ||||
| -rw-r--r-- | lib/sisu/v3/dal_images.rb | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/data/doc/sisu/CHANGELOG_v3 b/data/doc/sisu/CHANGELOG_v3 index 5f205f71..c0922768 100644 --- a/data/doc/sisu/CHANGELOG_v3 +++ b/data/doc/sisu/CHANGELOG_v3 @@ -32,6 +32,9 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.18.orig.tar.xz * correct sisupod references and path to .txz (replace .zip) + * dal_images, disabled imagemagick configuration permission check until + sisupod reads local sisurc.yml (configuration file) + * correct .orig.tar.xz name in CHANGELOG_v3 (>=3.0.15) %% 3.0.17.orig.tar.xz (2011-01-05:36/1) diff --git a/lib/sisu/v3/dal_images.rb b/lib/sisu/v3/dal_images.rb index c2088874..b05c7ec7 100644 --- a/lib/sisu/v3/dal_images.rb +++ b/lib/sisu/v3/dal_images.rb @@ -67,7 +67,7 @@ module SiSU_images data=@data tuned_file=[] @rmgk=false - imagemagick_=SiSU_Env::Info_settings.new.program?('rmagick') + imagemagick_=true #imagemagick_=SiSU_Env::Info_settings.new.program?('rmagick') if imagemagick_ begin @rmgk=SiSU_Env::Load.new('RMagick').prog |