diff options
author | Ralph Amissah <ralph@amissah.com> | 2011-09-24 08:16:45 -0400 |
---|---|---|
committer | Ralph Amissah <ralph@amissah.com> | 2011-09-24 08:16:45 -0400 |
commit | 57bf3bd0c20140501abfef9567bd51eeac0a428c (patch) | |
tree | b830d6c6a44ed81c8f1973d33ee571421e29fd6a /lib/sisu/v3/param.rb | |
parent | debian/changelog (3.0.18-1) (diff) | |
parent | v3: remote, src & sisupod processing, and rsync placement (diff) |
Merge commit 'sisu-3.0.19' into debian/sid
Diffstat (limited to 'lib/sisu/v3/param.rb')
-rw-r--r-- | lib/sisu/v3/param.rb | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/lib/sisu/v3/param.rb b/lib/sisu/v3/param.rb index f9d7ecb0..e2cffa9b 100644 --- a/lib/sisu/v3/param.rb +++ b/lib/sisu/v3/param.rb @@ -87,7 +87,8 @@ module SiSU_Param @pstorefile="#{@env.processing_path.dal}/#{@fns}.pstore" end def get - if @opt.f_pth[:pth] != Dir.pwd #BUG check + if @opt.f_pth \ + and @opt.f_pth[:pth] != Dir.pwd #BUG check # you may need to change Dir.pwd to @opt.f_pth[:pth] where the latter # has a path value that is different, however, f_pth is not always set! p '-- bug alert -- ' @@ -131,9 +132,9 @@ module SiSU_Param def all s=nil if @author - s ||=((@date =~/([12][890]\d{2})/ ) \ + s ||=((@date =~/((?:1[4-9]|2[01])\d{2})/ ) \ ? ("Copyright (C) #{$1} #{@author}") - : ('Copyright (C)' + @author)) #matches years 1800 through 20\d\d 2004w19 + : ('Copyright (C)' + @author)) #matches years 1400 through 21\d\d end s end @@ -144,9 +145,9 @@ module SiSU_Param def all s=nil if @author - s ||=((@date =~/([12][890]\d{2})/ ) \ + s ||=((@date =~/((?:1[4-9]|2[01])\d{2})/ ) \ ? ("Copyright (C) #{$1} #{@author}") - : ('Copyright (C)' + @author)) #matches years 1800 through 20\d\d 2004w19 + : ('Copyright (C)' + @author)) #matches years 1400 through 21\d\d end s end @@ -287,7 +288,9 @@ module SiSU_Param a=@s.split(/\n%\s.+?$|[ ]*\n[ ]*/m) @h=build_hash(a) def author - @h['author']=(@h['author'] ? @h['author'] : @h['main']) + @h['author']=(@h['author'] \ + ? @h['author'] + : @h['main']) names=name_format(@h['author']) s=names[:name_str] l,n=Db[:col_name],'creator.author' |