Standalone HostFlags: Use ^ for negation, not !

The ! here doesn't cause any shell rune trouble in, but we want to
move to using ^ everywhere for consistency.

We still honour ! to support old configs.

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>

diff --git a/Osstest/HostDB/Static.pm b/Osstest/HostDB/Static.pm
index 3191c56562a2abb96c3088f0d613309ecbfdf554..ab9542dda8a74b0130cb8259287c98d5215477df 100644 (file)
--- a/Osstest/HostDB/Static.pm
+++ b/Osstest/HostDB/Static.pm
@@ -56,7 +56,7 @@ sub get_flags ($$) { #method
        return unless defined $str;
        foreach my $fl (split /[ \t,;]+/, $str) {
            next unless length $fl;
-           if ($fl =~ s/^\!//) {
+           if ($fl =~ s/^[!^]//) {
                delete $flags->{$fl};
            } else {
                $flags->{$fl} = 1;

diff --git a/README b/README
index 9d97c612771778978380758fe387f8c33c56c3c8..7b7bc52a0582217eccdfd9c6c1fd42267874280e 100644 (file)
--- a/README
+++ b/README
@@ -447,7 +447,7 @@ HostProp_<testbox>_NtpServer
 HostFlags_<testbox>
    Defines a set of flags for the host. Flags is a list separated by
    whitespace, comma or semi-colon. A flag can be unset by prepending
-   a !. Only used in standalone mode.
+   a ^ (or !). Only used in standalone mode.
 
 HostGroup_<testbox> <group>
    Defines a group of similar hosts of which <testbox> is a
@@ -488,7 +488,7 @@ TestHost
 HostProp_<property>
 HostProp_<host>_<property>
 HostFlags                flag,flag,flag,...
-HostFlags_<host>         flag,!flag,!flag,flag...
+HostFlags_<host>         flag,^flag,^flag,flag...
 
 HostProp_DhcpWatchMethod
    leases <format> <source>