diff options
| author | Ralph Amissah <ralph@amissah.com> | 2013-03-31 10:07:26 -0400 |
|---|---|---|
| committer | Ralph Amissah <ralph@amissah.com> | 2013-03-31 10:07:26 -0400 |
| commit | 4b1d0dd6880e9dcf1056657119acce87e28a233d (patch) | |
| tree | e4929926209072a3cecc36664821942a0b2c931c | |
| parent | v4: sysenv, yamlrc cosmetic (diff) | |
v4: options, exclude manifest links if no manifest (--no-manifest) selected
| -rw-r--r-- | data/doc/sisu/CHANGELOG_v4 | 2 | ||||
| -rw-r--r-- | lib/sisu/v4/options.rb | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/data/doc/sisu/CHANGELOG_v4 b/data/doc/sisu/CHANGELOG_v4 index 728cd85a..e9813f01 100644 --- a/data/doc/sisu/CHANGELOG_v4 +++ b/data/doc/sisu/CHANGELOG_v4 @@ -30,6 +30,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_4.0.19.orig.tar.xz * v4: sysenv, yamlrc, minor +* v4: options, exclude manifest links if no manifest (--no-manifest) selected + %% 4.0.18.orig.tar.xz (2013-03-29:12/5) http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.0.18 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_4.0.18-1 diff --git a/lib/sisu/v4/options.rb b/lib/sisu/v4/options.rb index 0608df4e..896cfe0a 100644 --- a/lib/sisu/v4/options.rb +++ b/lib/sisu/v4/options.rb @@ -718,6 +718,9 @@ module SiSU_Commandline end act[:links_to_manifest]=if mod.inspect =~/"--inc-links-to-manifest"|"--inc-manifest-links"/ { bool: true, set: :on } + elsif mod.inspect =~/"--(?:exc|no)-manifest"/ \ + || act[:switch][:off].inspect =~/"manifest"/ #place lower + { bool: false, set: :off } elsif mod.inspect =~/"--(?:exc|no)-links-to-manifest"|"--(?:exc|no)-manifest-links"/ \ || act[:switch][:off].inspect =~/"links_to_manifest"|"manifest_links"|"--(?:exc|no)-manifest"/ \ || mod.inspect =~/"--(?:redirect|dump)/ |