11.4 is no more

openSUSE · Dec 14, 2012 · 5e9f2ec · 5e9f2ec
1 parent a38e59e
commit 5e9f2ec
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 37 deletions.
diff --git a/app/controllers/main_controller.rb b/app/controllers/main_controller.rb
@@ -26,27 +26,7 @@ def ymp_without_arch_and_version
   end
 
   def set_release(release)
-    if release == "114"
-      @isos = {}
-      @directory = "http://download.opensuse.org/distribution/11.4"
-      @isos["lang-32"] = "11.4-Addon-Lang-i586"
-      @isos["lang-64"] = "11.4-Addon-Lang-x86_64"
-      @isos["nonoss"] = "11.4-Addon-NonOss-BiArch-i586-x86_64"
-      @isos["kde-64"] = "11.4-KDE-LiveCD-x86_64"
-      @isos["kde-32"] = "11.4-KDE-LiveCD-i686"
-      @isos["gnome-64"] = "11.4-GNOME-LiveCD-x86_64"
-      @isos["gnome-32"] = "11.4-GNOME-LiveCD-i686"
-      @isos["dvd-64"] = "11.4-DVD-x86_64"
-      @isos["dvd-32"] = "11.4-DVD-i586"
-      @isos["net-32"] = "11.4-NET-i586"
-      @isos["net-64"] = "11.4-NET-x86_64"
-
-      @releasenotes = _("http://www.suse.de/relnotes/i386/openSUSE/11.4/RELEASE-NOTES.en.html")
-      @releasename = "openSUSE 11.4"
-      @repourl = "http://download.opensuse.org/distribution/11.4"
-      @medium = "dvd"
-      @gpg = "4E98 E675 19D9 8DC7 362A 5990 E3A5 C360 307E 3D54"
-    elsif release == "121"
+    if release == "121"
       @isos = {}
       @directory = "http://download.opensuse.org/distribution/12.1"
       @isos["lang-32"] = "12.1-Addon-Lang-i586"
@@ -89,21 +69,21 @@ def set_release(release)
 
     elsif release == "developer"
       @isos = {}
-      @directory = "http://download.opensuse.org/distribution/12.3-Milestone1"
-      @isos["lang-32"] = "Addon-Lang-Build0166-i586"
-      @isos["lang-64"] = "Addon-Lang-Build0166-x86_64"
-      @isos["nonoss"] = "Addon-NonOss-BiArch-Build0166-i586-x86_64"
-      @isos["kde-64"] = "KDE-LiveCD-Build0166-x86_64"
-      @isos["kde-32"] = "KDE-LiveCD-Build0166-i686"
-      @isos["gnome-64"] = "GNOME-LiveCD-Build0166-x86_64"
-      @isos["gnome-32"] = "GNOME-LiveCD-Build0166-i686"
-      @isos["dvd-64"] = "DVD-Build0166-x86_64"
-      @isos["dvd-32"] = "DVD-Build0166-i586"
-      @isos["net-32"] = "NET-Build0166-i586"
-      @isos["net-64"] = "NET-Build0166-x86_64"
+      @directory = "http://download.opensuse.org/distribution/12.3-Milestone2"
+      @isos["lang-32"] = "Addon-Lang-Build0260-i586"
+      @isos["lang-64"] = "Addon-Lang-Build0260-x86_64"
+      @isos["nonoss"] = "Addon-NonOss-BiArch-Build0260-i586-x86_64"
+      @isos["kde-64"] = "KDE-LiveCD-Build0260-x86_64"
+      @isos["kde-32"] = "KDE-LiveCD-Build0260-i686"
+      @isos["gnome-64"] = "GNOME-LiveCD-Build0260-x86_64"
+      @isos["gnome-32"] = "GNOME-LiveCD-Build0260-i686"
+      @isos["dvd-64"] = "DVD-Build0260-x86_64"
+      @isos["dvd-32"] = "DVD-Build0260-i586"
+      @isos["net-32"] = "NET-Build0260-i586"
+      @isos["net-64"] = "NET-Build0260-x86_64"
 
       @releasenotes = _("https://www.suse.com/releasenotes/x86_64/openSUSE/12.3")
-      @releasename = "openSUSE 12.3 Milestone1"
+      @releasename = "openSUSE 12.3 Milestone2"
       @repourl = "http://download.opensuse.org/distribution/12.3"
       @medium = "dvd"
       @gpg = "22C0 7BA5 3417 8CD0 2EFE 22AA B88B 2FD4 3DBD C284"

diff --git a/config/routes.rb b/config/routes.rb
@@ -7,8 +7,8 @@
     match 'main/download' => :download
     match '122' => :index
     match '122/:locale' => :release, :release => "122"
-    match '121/:locale' => :release, :release => "121"
-    match '114/:locale' => :release, :release => "114", :outdated => true
+    match '121' => :release, :release => "121", :outdated => true
+    match '121/:locale' => :release, :release => "121", :outdated => true
 
     match 'change_install' => :change_install
 
@@ -18,7 +18,8 @@
           :constrains => { :project => /[\w\-\.:]+/, :repository => /[\w\-\.:]+/, :arch => /[\w\-\.:]+/, :binary => /[\w\-\.:\+]+/ }
 
     #map unavailable version to the latest release
-    match ':version/:locale' => :release, :release => "122", :constraints => { :version => /[\d]+/ }
+    match ':version' => :index, :constraints => { :version => /[\d]+/ }
+    match ':version/:locale' => :index, :constraints => { :version => /[\d]+/ }
     match 'developer/:locale' => :release, :release => "developer"
   end