diff options
author | Ralph Amissah <ralph@amissah.com> | 2011-09-13 19:29:10 -0400 |
---|---|---|
committer | Ralph Amissah <ralph@amissah.com> | 2011-09-13 19:29:10 -0400 |
commit | ce02177eb0a7a053e9eeebc965dbee9bbfda101e (patch) | |
tree | 0cb1f18b66f70706c2da8eade87bc8e394b76c06 /lib/sisu/v3/remote.rb | |
parent | debian/changelog (3.0.17-1) (diff) | |
parent | v3: epub (diff) |
Merge commit 'sisu-3.0.18' into debian/sid
Diffstat (limited to 'lib/sisu/v3/remote.rb')
-rw-r--r-- | lib/sisu/v3/remote.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/sisu/v3/remote.rb b/lib/sisu/v3/remote.rb index bda7529b..1e974f9c 100644 --- a/lib/sisu/v3/remote.rb +++ b/lib/sisu/v3/remote.rb @@ -180,8 +180,8 @@ module SiSU_Remote @requested_file=requested_file end def pod - re_p_div=/https?:\/\/([^\/]+)(\/\S+)\/(sisupod(?:\.txz)?|\S+?(?:\.ss[mt]\.txz)?|[^\/]+?\.ssp)$/ - re_p=/(sisupod(?:\.txz)?|\S+?\.ss[mt](?:\.txz)?|[^\/]+?\.ssp)$/ + re_p_div=/https?:\/\/([^\/]+)(\/\S+)\/(sisupod\.(?:txz|zip)|\S+?(?:\.ss[mt]\.(?:txz|zip))?|[^\/]+?\.ssp)$/ + re_p=/(sisupod\.(?:txz|zip)|\S+?\.ss[mt]\.(?:txz|zip)?|[^\/]+?\.ssp)$/ if @requested_file =~ re_p_div @site,@pth,@pod= re_p_div.match(@requested_file).captures elsif @requested_file =~ re_p |