[backend] refactor checkbuildrepoid function

openSUSE · Dec 7, 2012 · f2b69c0 · f2b69c0
1 parent bf9daed
commit f2b69c0
Showing 1 changed file with 15 additions and 16 deletions.
diff --git a/src/backend/bs_sched b/src/backend/bs_sched
@@ -2129,6 +2129,20 @@ my %watchremoteprojs;	# tmp, only set in addwatchremote
 my @retryevents;
 
 
+sub checkbuildrepoid {
+  my ($projpacksin) = @_;
+  die("ERROR: source server did not report a repoid") unless $projpacksin->{'repoid'};
+  my $buildrepoid = readstr("$reporoot/_repoid", 1);
+  if (!$buildrepoid) {
+    # set the repoid on first run
+    $buildrepoid = $projpacksin->{'repoid'};
+    mkdir_p($reporoot) unless -d "$reporoot";
+    writestr("$reporoot/._repoid$$", "$reporoot/_repoid", $buildrepoid);
+  }
+  die("ERROR: My repository id($buildrepoid) has wrong length(".length($buildrepoid).")") unless length($buildrepoid) == 9;
+  die("ERROR: source server repository id($projpacksin->{'repoid'}) does not match my repository id($buildrepoid)") unless $buildrepoid eq $projpacksin->{'repoid'};
+}
+
 #
 # get_projpacks:  get/update project/package information
 #
@@ -2201,22 +2215,7 @@ sub get_projpacks {
   }
 
   # Be sure that this is the right source server for my binary packages
-  die("ERROR: source server did not report a repoid") unless $projpacksin->{'repoid'};
-  my $buildrepoid;
-  eval {
-    $buildrepoid = readstr("$reporoot/_repoid");
-  };
-  unless ($buildrepoid) {
-    # set the repoid on first run
-    $buildrepoid = $projpacksin->{'repoid'};
-    mkdir_p("$reporoot") unless -d "$reporoot";
-    eval {
-      # it does not matter which bs_sched for which architecture succeeds to write this file
-      writestr("$reporoot/._repoid", "$reporoot/_repoid", $projpacksin->{'repoid'});
-    };
-  }
-  die("ERROR: My repository id($buildrepoid) has wrong length(".length($buildrepoid).")") unless length($buildrepoid) == 9;
-  die("ERROR: source server repository id($projpacksin->{'repoid'}) does not match my repository id($buildrepoid)") unless $buildrepoid eq $projpacksin->{'repoid'};
+  checkbuildrepoid($projpacksin);
 
   for my $proj (@{$projpacksin->{'project'} || []}) {
     if (@packids) {