mirrors/scst
1
0
Fork 0
mirror of https://github.com/SCST-project/scst.git synced 2026-05-17 18:51:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Regenerate temp group name should the current one already exist.

Browse Source 
- Include temp group renames in the change count.



git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@1141 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Mark Buechler
2009-09-25 13:56:06 +00:00
parent 0ff548a598
commit 300922e6c5
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
scstadmin/scstadmin
View File

@@ -970,8 +970,7 @@ sub applyConfiguration {
foreach my $group (keys %used_users) {
if (!defined($USERS{$group})) {
if ($group =~ /^$_TGT_DEF_PREFIX_/) {
my $rnd_id = randomGroupId();
my $tmp_group = $_TGT_TMP_PREFIX_.$rnd_id;
my $tmp_group = randomGroup();
print "\t-> Using temporary group '$tmp_group' for group '$group'.\n";
@@ -1078,6 +1077,7 @@ sub applyConfiguration {
print "\t-> Processing temporary group '$tmp_group'.\n";
renameGroup($tmp_group, $group);
$changes++;
}
# Enable/Disable configured targets
@@ -1946,8 +1946,16 @@ sub validHandlerTypes {
return $buffer;
}
sub randomGroupId {
return int(rand(10000));
sub randomGroup {
my $tmp_group;
while (!$tmp_group || $SCST->groupExists($tmp_group)) {
my $id = int(rand(10000));
$tmp_group = $_TGT_TMP_PREFIX_.$id;
}
return $tmp_group;
}
# If we have an unread error from SCST, exit immediately