From 8754d67b4e4bec1c8b65e73cdfa66911d13018b0 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Sat, 19 May 2012 23:22:30 -0400
Subject: v3: options, create manifest touched
---
data/doc/sisu/CHANGELOG_v3 | 2 ++
lib/sisu/v3/options.rb | 9 ++++-----
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/data/doc/sisu/CHANGELOG_v3 b/data/doc/sisu/CHANGELOG_v3
index 8b2f2ea7..a3e8b54d 100644
--- a/data/doc/sisu/CHANGELOG_v3
+++ b/data/doc/sisu/CHANGELOG_v3
@@ -26,6 +26,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_3.2.9.orig.tar.xz
* harvest_topics, add level
* harvest_topics, alternative headings, fix
+* v3: options, create manifest touched
+
%% 3.2.8.orig.tar.xz (2012-05-12:19/6)
http://git.sisudoc.org/?p=code/sisu.git;a=log;h=refs/tags/sisu_3.2.8
http://git.sisudoc.org/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_3.2.8-1
diff --git a/lib/sisu/v3/options.rb b/lib/sisu/v3/options.rb
index a193c093..c4dbf812 100644
--- a/lib/sisu/v3/options.rb
+++ b/lib/sisu/v3/options.rb
@@ -535,12 +535,15 @@ module SiSU_Commandline
elsif mod.inspect =~/"--(?:exc|no)-manifest"/ \
|| act[:switch][:off].inspect =~/"manifest"/
{ bool: false, set: :off }
+ elsif act[:manifest]=(cmd =~/y/ \
+ || mod.inspect =~/"--manifest"/)
+ { bool: true, set: :on }
else { bool: true, set: :na }
end
act[:links_to_manifest]=if mod.inspect =~/"--inc-links-to-manifest"|"--inc-manifest-links"/
{ bool: true, set: :on }
elsif mod.inspect =~/"--(?:exc|no)-links-to-manifest"|"--(?:exc|no)-manifest-links"/ \
- || act[:switch][:off].inspect =~/"links_to_manifest"|"manifest_links"/ \
+ || act[:switch][:off].inspect =~/"links_to_manifest"|"manifest_links"|"--(?:exc|no)-manifest"/ \
|| mod.inspect =~/"--(?:redirect|dump)/
{ bool: false, set: :off }
else { bool: true, set: :na }
@@ -750,10 +753,6 @@ module SiSU_Commandline
|| mod.inspect =~/"--qrcode"/) \
? { bool: true, set: :on }
: { bool: false, set: :na }
- act[:manifest]=(cmd =~/y/ \
- || mod.inspect =~/"--manifest"/) \
- ? { bool: true, set: :on }
- : { bool: false, set: :na }
act[:help]=(mod.inspect =~/"--help/) \
? { bool: true, set: :on }
: { bool: false, set: :na }
--
cgit v1.2.3