[backend] move mergeroles to BSSrcServer::Access

openSUSE · Sep 8, 2016 · 86d9f07 · 86d9f07
1 parent 08783aa
commit 86d9f07
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 18 deletions.
diff --git a/src/backend/BSSrcServer/Access.pm b/src/backend/BSSrcServer/Access.pm
@@ -39,4 +39,21 @@ sub checksourceaccess {
   return 1;
 }
 
+# this is kind of a snapshot in time, but good enough for now 
+sub mergeroles {
+  my ($projid, $proj) = @_;
+  my @person;
+  my @group;
+  while ($projid ne '') {
+    $proj ||= BSRevision::readproj_local($projid, 1);
+    if ($proj) {
+      push @person, @{$proj->{'person'} || []};
+      push @group , @{$proj->{'group'} || []};
+    }
+    last unless $projid =~ s/:[^:]*$//;
+    undef $proj;
+  }
+  return (\@person, \@group);
+}
+
 1;
diff --git a/src/backend/bs_srcserver b/src/backend/bs_srcserver
@@ -885,23 +885,6 @@ sub getprojquotapackage {
   return $packagequota{':packages'};
 }
 
-# this is kind of a snapshot in time, but good enough for now 
-sub mergeroles {
-  my ($projid, $proj) = @_; 
-  my @person;
-  my @group;
-  while ($projid ne '') {
-    $proj ||= BSRevision::readproj_local($projid, 1); 
-    if ($proj) {
-      push @person, @{$proj->{'person'} || []};
-      push @group , @{$proj->{'group'} || []};
-    }   
-    last unless $projid =~ s/:[^:]*$//;
-    undef $proj;
-  }
-  return (\@person, \@group);
-}
-
 sub readbuildenv {
   my ($pinfo, $rev, $files, $repoid, $arch) = @_;
   my $bifile = "_buildenv.$repoid.$arch";
@@ -1121,7 +1104,7 @@ sub getprojpack {
     }
     if ($proj->{'access'}) {
       # we need the roles if the project is protected, see checkroles() in the scheduler
-      my ($person, $group) = mergeroles($projid, $proj);
+      my ($person, $group) = BSSrcServer::Access::mergeroles($projid, $proj);
       $jinfo->{'person'} = $person if $person && @$person;
       $jinfo->{'group'} = $group if $group && @$group;
     }