From 598c4fe868aa8861129fb1d6ed8dc12a3c088989 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Mon, 19 Dec 2011 22:05:54 -0500 Subject: v3: options, --find & --glob, use for general search in base directory * cannot be limited by sub-directory, error message provided --- data/doc/sisu/CHANGELOG_v3 | 5 +++++ lib/sisu/v3/options.rb | 7 ++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/data/doc/sisu/CHANGELOG_v3 b/data/doc/sisu/CHANGELOG_v3 index e38c40ff..12b062cb 100644 --- a/data/doc/sisu/CHANGELOG_v3 +++ b/data/doc/sisu/CHANGELOG_v3 @@ -21,6 +21,11 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_3.1.9.orig.tar.xz sisu_3.1.9-1.dsc sisu_3.1.9-1.debian.tar.gz + * options, behavior of --find & --glob, can only be used on base directory + level, (it is not possible to limit the glob to say en/... or fr/...), for + now prints a message that sub-directories may not be provided for --find or + --glob at this time + %% 3.1.8.orig.tar.xz (2011-12-13:50/2) http://git.sisudoc.org/?p=code/sisu.git;a=log;h=refs/tags/sisu_3.1.8 http://git.sisudoc.org/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_3.1.8-1 diff --git a/lib/sisu/v3/options.rb b/lib/sisu/v3/options.rb index ffd0da0f..b9d54123 100644 --- a/lib/sisu/v3/options.rb +++ b/lib/sisu/v3/options.rb @@ -131,7 +131,12 @@ module SiSU_commandline if find_flag \ && y !~ /^-/ \ && y =~ /\S+/ - f << y + if y !~/\// + f << y + else + find_flag=false + puts %{sub-directories "#{y}" cannot be provided for --find or --glob at this time} + end end end r=Px[:lng_lst].join('|') -- cgit v1.2.3