make it more difficult to have $mycall & $myalias the same

diff --git a/perl/Version.pm b/perl/Version.pm
index 8a4fab3ee39b97962f40dbf4f7ffd401fe803187..fbd3298dc5bcd3bd811536801c350a73110610c5 100644 (file)
--- a/perl/Version.pm
+++ b/perl/Version.pm
@@ -11,6 +11,6 @@ use vars qw($version $subversion $build);
 
 $version = '1.55';
 $subversion = '0';
-$build = '33';
+$build = '34';
 
 1;

diff --git a/perl/cluster.pl b/perl/cluster.pl
index bc57440f3dc31f5ce95a8f38d41ac565b8cdfae8..7b889fc4c63781d4e9ace3641932a7d594e8695e 100755 (executable)
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -405,6 +405,7 @@ DXUser->init($userfn, 1);
 
 # look for the sysop and the alias user and complain if they aren't there
 {
+       die "\$myalias \& \$mycall are the same ($mycall)!, they must be different (hint: make \$mycall = '${mycall}-2';). Oh and don't forget to rerun create_sysop.pl!" if $mycall eq $myalias;
        my $ref = DXUser::get($mycall);
        die "$mycall missing, run the create_sysop.pl script and please RTFM" unless $ref && $ref->priv == 9;
        $ref = DXUser::get($myalias);

diff --git a/perl/create_sysop.pl b/perl/create_sysop.pl
index c0ac9e3afc7d8557803a71fc146e65a72fc09349..c59358b612dea4efa99f2e44e555617c4ca83bcf 100755 (executable)
--- a/perl/create_sysop.pl
+++ b/perl/create_sysop.pl
@@ -76,6 +76,8 @@ sub create_it
 
 }
 
+die "\$myalias \& \$mycall are the same ($mycall)!, they must be different (hint: make \$mycall = '${mycall}-2';).\n" if $mycall eq $myalias;
+
 $lockfn = "$root/local/cluster.lck";       # lock file name
 if (-e $lockfn) {
        open(CLLOCK, "$lockfn") or die "Can't open Lockfile ($lockfn) $!";

diff --git a/perl/update_sysop.pl b/perl/update_sysop.pl
index 2fccbb5aee90c8aa2f46fa5c5412b933150b187d..6700b98ff18c1728bae75427dfc0d350729b3cda 100755 (executable)
--- a/perl/update_sysop.pl
+++ b/perl/update_sysop.pl
@@ -83,6 +83,8 @@ sub create_it
 
 }
 
+die "\$myalias \& \$mycall are the same ($mycall)!, they must be different (hint: make \$mycall = '${mycall}-2';).\n" if $mycall eq $myalias;
+
 $lockfn = "$root/local/cluster.lck";       # lock file name
 if (-e $lockfn) {
        open(CLLOCK, "$lockfn") or die "Can't open Lockfile ($lockfn) $!";