X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2Fcluster.pl;h=3336d077482f0114d2558b8cc696dbbede4f612f;hb=65ed61f1c171b124771f0214c186cf57e0bb41ff;hp=81e23cf874ce35c04561f725f5f8768a382495e4;hpb=c664bf735ebbf814c651b6d9d94fbd5abb8cd15c;p=spider.git

diff --git a/perl/cluster.pl b/perl/cluster.pl
index 81e23cf8..3336d077 100755
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -387,7 +387,7 @@ if (DXSql::init($dsn)) {
 		# determine the real version number
 		my $repo = Git->repository(Directory => "$root/.git");
 		if ($repo) {
-			my $desc = $repo->command_oneline(['describe', '--long'], STDERR => 0);
+			my $desc = $repo->command_oneline(['describe'], STDERR => 0);
 			if ($desc) {
 				my ($v, $s, $b, $g) = $desc =~ /^([\d.]+)(?:\.(\d+))?-(\d+)-g([0-9a-f]+)/;
 				$version = $v;
@@ -423,13 +423,24 @@ Bands::load();
 dbg("loading user file system ...");
 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;
+	my $oldsort = $ref->sort;
+	if ($oldsort ne 'S') {
+		$ref->sort('S');
+		dbg "Resetting node type from $oldsort -> DXSpider ('S')";
+	}
 	$ref = DXUser::get($myalias);
 	die "$myalias missing, run the create_sysop.pl script and please RTFM" unless $ref && $ref->priv == 9;
+	$oldsort = $ref->sort;
+	if ($oldsort ne 'U') {
+		$ref->sort('U');
+		dbg "Resetting sysop user type from $oldsort -> User ('U')";
+	}
 }
 
 # start listening for incoming messages/connects