diff options
| author | Ralph Amissah <ralph@amissah.com> | 2010-10-03 22:40:31 -0400 |
|---|---|---|
| committer | Ralph Amissah <ralph@amissah.com> | 2010-10-03 22:40:42 -0400 |
| commit | daf29aa25fe25b1d435ef3c29ad12c5bd44ffe18 (patch) | |
| tree | 34268c059e043c6d17c9206270ca42700987af4c /lib | |
| parent | urls, cleaning (diff) | |
hub, fix breakage when -y (manifest) is run without -m
* hub, fix sisu breakage when -y (manifest) is run without the explicit or
implicit calling of -m (creation of document abstraction for processing),
(e.g. when --source or --sisupod is called on its own).
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/sisu/v2/hub.rb | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/lib/sisu/v2/hub.rb b/lib/sisu/v2/hub.rb index 4b06a45c..9c4fb714 100644 --- a/lib/sisu/v2/hub.rb +++ b/lib/sisu/v2/hub.rb @@ -291,7 +291,7 @@ p "here #{__FILE__} #{__LINE__}" if @opt =~/M/ flag=SiSU_Env::Info_processing_flag.new extra='' if @opt.cmd !~/[mn]/ - extra+=if @opt.cmd =~/[abeghHhIiJjNOoptTwXxz]/ \ + extra+=if @opt.cmd =~/[abegHhIiNOopTtwXxyz]/ \ and @opt.cmd !~/[mn]/ 'm' #% add dal elsif ((@opt.cmd =~/[Dd]/ \ @@ -303,18 +303,20 @@ p "here #{__FILE__} #{__LINE__}" if @opt =~/M/ end end if @opt.cmd !~/y/ - extra+=if @opt.cmd =~/[abehHhIiJjNopsSstwXxz]/ \ + extra+=if @opt.cmd =~/[abeHhIiNopsSstwXxz]/ \ and @opt.cmd !~/y/ - 'y' #% add manifest + 'ym' #% add manifest elsif (@opt.cmd =~/[Dd]/ \ or @opt.mod.inspect =~/--(?:(?:sq)?lite|pg(?:sql)?)/) \ and @opt.files[0] !~/^remove$/ \ and @opt.cmd !~/y/ - 'y' #% add manifest + 'ym' #% add manifest else '' end end @opt.cmd=@opt.cmd + extra + opt=@opt.cmd.scan(/CC|\S/) + @opt.cmd=opt.uniq.join if @opt.cmd =~/[vVM]/ #% version information if @opt.cmd =~/V/ \ and @opt.files.empty? #% environment |