[backend] drop slepool hack, the sle people don't want it

openSUSE · Sep 16, 2014 · 55aaf02 · 55aaf02
1 parent 4df5a8d
commit 55aaf02
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 47 deletions.
diff --git a/src/backend/bs_publish b/src/backend/bs_publish
@@ -1471,25 +1471,6 @@ sub publish {
 	  next;
 	} elsif (-d "$r/$rbin") {
 	  $p = "repo/$bin";
-	  if ($repotype{'slepool'}) {
-	    # HACK: do fancy sle repo renaming
-	    my $name = $repotype{'slepool'}->[0] || 'product';
-	    $p = $bin;
-	    if ($bin =~ /.*-Media1(\.license|)$/) {
-	      $p = "$name$1";
-	    } elsif ($bin =~ /-Media3$/) {
-	      $p = "${name}_debug";
-	    } elsif ($bin =~ /-Media2$/) {
-	      my $rbin3 = $rbin;
-	      $rbin3 =~ s/2$/3/;
-	      if (-d "$r/$rbin3") {
-	        $p = "${name}_source";	# 3 media available, 2 is source
-	      } else {
-	        $p = "${name}_debug";	# source is on media 1, 2 is debug
-	      }
-	    }
-	    $p = $bin if $kiwimedium{$p};	# what???
-	  }
 	  $kiwimedium{$p} = $bin;
 	} else {
 	  next;

diff --git a/src/backend/bs_srcserver b/src/backend/bs_srcserver
@@ -7139,34 +7139,7 @@ sub published_path {
   if ($medium && $medium =~ /\.iso$/) {
     $medium = "iso/$medium";
   } elsif ($medium) {
-    my @path = expandsearchpath($projid, $repoid);
-    my $c = concatconfigs($projid, $cgi->{'repository'}, undef, @path);
-    my $bconf = Build::read_config('noarch', [ split("\n", $c) ]);
-    my %repotype;
-    for (@{$bconf->{'repotype'} || []}) {
-      if (/^(.*?):(.*)$/) {
-        $repotype{$1} = [ split(':', $2) ];
-      } else {
-        $repotype{$_} = [];
-      }    
-    }
-    if ($repotype{'slepool'}) {
-      my $name = $repotype{'slepool'}->[0] || 'product';
-      if ($medium =~ /-Media1$/) {
-	$medium = $name;
-      } elsif ($medium =~ /-Media3$/) {
-	$medium = "${name}_debug";
-      } elsif ($medium =~ /-Media2$/) {
-        my $repoinfo;
-	eval {
-	  $repoinfo = $prp_to_repoinfo{$prp};
-	};
-	my $binaryorigins = ($repoinfo || {})->{'binaryorigins'};
-	$medium = $binaryorigins->{"${name}_source"} ? "${name}_source" : "${name}_debug";
-      }
-    } else {
-      $medium = "repo/$medium";
-    }
+    $medium = "repo/$medium";
   }
   if ($medium) {
     $path .= "/$medium" if defined $path;