Skip to content

Commit

Permalink
Fix backports listing
Browse files Browse the repository at this point in the history
Backports was listed as SUSE SLE-12 SLE-Module-Toolchain as
the prj meta chains up to that.
Also remove the weird mapping of repos. Rely on baseproject from OBS only.
  • Loading branch information
lnussel committed Jul 31, 2017
1 parent 4ef8ca1 commit da9344d
Showing 1 changed file with 3 additions and 14 deletions.
17 changes: 3 additions & 14 deletions app/controllers/package_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -41,21 +41,10 @@ def show
@packages.reject!{|p| p.project.match(/openSUSE\:Maintenance\:/) }

@packages.each do |package|

if (package.repository.match(/Tumbleweed/) || (package.project == "openSUSE:Tumbleweed"))
package.baseproject = "openSUSE:Factory"
elsif (package.project.match(/openSUSE:Evergreen/))
# Backports chains up to the toolchain module for newer GCC.
# So break the link immediately.
if (package.project.match(/^openSUSE:Backports:SLE-12/))
package.baseproject = package.project
elsif (package.repository.match(/^Factory$/i))
package.baseproject = "openSUSE:Factory"
elsif (package.repository.match(/^\d{2}\.\d$/))
package.baseproject = "openSUSE:" + package.repository
elsif (!(@distributions.map{|d| d[:reponame]}.include? package.repository) &&
(package.repository != "standard") &&
(package.repository != "snapshot") &&
(!package.repository.match(/_Update$/)))
logger.info("Found non-std repo: #{package.repository}")
package.baseproject = package.repository.gsub("_", ":")
end
end

Expand Down

0 comments on commit da9344d

Please sign in to comment.