From c8cde4858eb8b1d0356b32f3b3ec1f6e8d38aec3 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 23 Dec 2008 17:13:57 -0500 Subject: Add deprecation warning for GlobLists, which will stop working in 3.0. --- IkiWiki.pm | 2 ++ debian/changelog | 1 + 2 files changed, 3 insertions(+) diff --git a/IkiWiki.pm b/IkiWiki.pm index 6747a3ba4..a81e34c3d 100644 --- a/IkiWiki.pm +++ b/IkiWiki.pm @@ -1597,6 +1597,8 @@ sub rcs_receive () { } sub globlist_to_pagespec ($) { + print STDERR "warning: deprecated GlobList style PageSpec \"$_[0]\" will stop working in ikiwiki version 3.0\n"; + my @globlist=split(' ', shift); my (@spec, @skip); diff --git a/debian/changelog b/debian/changelog index ce3949436..2c8931735 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ ikiwiki (2.72) UNRELEASED; urgency=low * Avoid comments in recentchanges being broken links (smcv) + * Add deprecation warning for GlobLists, which will stop working in 3.0. -- Joey Hess Mon, 22 Dec 2008 19:02:16 -0500 -- cgit v1.2.3 From f65311bddb82133e51ab504220dac2b839a2b535 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 23 Dec 2008 17:19:27 -0500 Subject: hack to avoid globlist deprecaton message false positive --- IkiWiki.pm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/IkiWiki.pm b/IkiWiki.pm index a81e34c3d..cc1e89acc 100644 --- a/IkiWiki.pm +++ b/IkiWiki.pm @@ -1597,8 +1597,6 @@ sub rcs_receive () { } sub globlist_to_pagespec ($) { - print STDERR "warning: deprecated GlobList style PageSpec \"$_[0]\" will stop working in ikiwiki version 3.0\n"; - my @globlist=split(' ', shift); my (@spec, @skip); @@ -1626,7 +1624,10 @@ sub globlist_to_pagespec ($) { sub is_globlist ($) { my $s=shift; - return ( $s =~ /[^\s]+\s+([^\s]+)/ && $1 ne "and" && $1 ne "or" ); + my $ret= ( $s =~ /[^\s]+\s+([^\s]+)/ && $1 ne "and" && $1 ne "or" ); + print STDERR "warning: deprecated GlobList style PageSpec \"$s\" will stop working in ikiwiki version 3.0\n" + if $ret && $s !~ /TMPL_VAR/; # hack alert + return $ret; } sub safequote ($) { -- cgit v1.2.3