Terminology: Groups, not classes

diff --git a/lib/bin/bex-add b/lib/bin/bex-add
index 5ed30b59b321025167f06ee390b7d0e816b920e5..7138ef5046bc38b5677347786efe58ed700f642d 100755 (executable)
--- a/lib/bin/bex-add
+++ b/lib/bin/bex-add
@@ -21,7 +21,7 @@ my @attach = ();
 
 sub usage() {
        print <<AMEN ;
 
 sub usage() {
        print <<AMEN ;

-Usage: bex add [<options>] [!]<machine-or-class> ...
+Usage: bex add [<options>] [!]<machine-or-group> ...

 
 Options:
 -a, --attach=<path>    Attach a file or directory to the job
 
 Options:
 -a, --attach=<path>    Attach a file or directory to the job

diff --git a/lib/bin/bex-prun b/lib/bin/bex-prun
index 95c8d771fe0337c7237cb6754f2c37a9b20e021e..ba926fd4e4abd1b5407ba4c37a69c346a2321ac5 100755 (executable)
--- a/lib/bin/bex-prun
+++ b/lib/bin/bex-prun
@@ -17,7 +17,7 @@ my $debug_children;
 
 sub usage() {
        print <<AMEN ;
 
 sub usage() {
        print <<AMEN ;

-Usage: bex prun [<options>] [[!]<machine-or-class> ...]
+Usage: bex prun [<options>] [[!]<machine-or-group> ...]

 
 Options:
     --debug            Log status changes to stderr
 
 Options:
     --debug            Log status changes to stderr

diff --git a/lib/bin/bex-queue b/lib/bin/bex-queue
index 6a39852465a62f7a2194d2f704402a2087c79881..b568b17b7b3d994ed39f98a934f8239740114901 100755 (executable)
--- a/lib/bin/bex-queue
+++ b/lib/bin/bex-queue
@@ -23,7 +23,7 @@ my $why;
 
 sub usage() {
        print <<AMEN ;
 
 sub usage() {
        print <<AMEN ;

-Usage: bex queue [<options and actions>] [[!]<machine-or-class> ...]
+Usage: bex queue [<options and actions>] [[!]<machine-or-group> ...]

 
 Actions:
     --by-job           Show jobs sorted by job ID (default)
 
 Actions:
     --by-job           Show jobs sorted by job ID (default)

diff --git a/lib/bin/bex-run b/lib/bin/bex-run
index 25241201094e2cbea1256b72fa1950e32ed75446..c5e67d4bbc7a683c83346692e198803e6dde53cf 100755 (executable)
--- a/lib/bin/bex-run
+++ b/lib/bin/bex-run
@@ -9,7 +9,7 @@ use BEX;
 
 sub usage() {
        print <<AMEN ;
 
 sub usage() {
        print <<AMEN ;

-Usage: bex run [<options>] [[!]<machine-or-class> ...]
+Usage: bex run [<options>] [[!]<machine-or-group> ...]

 
 Options:
 -j, --job=<id>         Run only the specified job
 
 Options:
 -j, --job=<id>         Run only the specified job

diff --git a/lib/perl/BEX/Config.pm b/lib/perl/BEX/Config.pm
index f6239f0fb289e7898152af23bbb593ee71e42f8a..a1c8adab131b0755bba9cb65e29dda81618f2652 100644 (file)
--- a/lib/perl/BEX/Config.pm
+++ b/lib/perl/BEX/Config.pm
@@ -84,7 +84,7 @@ sub parse_machine_list(@) {
                if ($m =~ s{^!}{}) { $op = 0; }
                my $v = $machines{$m};
                if (!defined $v) {
                if ($m =~ s{^!}{}) { $op = 0; }
                my $v = $machines{$m};
                if (!defined $v) {

-                       die "Unknown machine or class: $m\n";
+                       die "Unknown machine or group $m\n";

                } elsif (ref($v) eq 'HASH') {
                        $set{$m} = $op;
                } elsif (ref($v) eq 'ARRAY') {
                } elsif (ref($v) eq 'HASH') {
                        $set{$m} = $op;
                } elsif (ref($v) eq 'ARRAY') {