X-Git-Url: http://git.pjr.cc/?a=blobdiff_plain;f=plugins%2Fknownos.php;h=77ccc8181813cd97c171d5c255342ea5ea20f4fb;hb=486854e1f39db5dd0fe2f317d2a586dd6ac39124;hp=ee1b15a566bd2630ff67f6ca194387d4c0e64eef;hpb=671e643949bab1c87d175bfc98ff086deb9c44ff;p=glcas.git

diff --git a/plugins/knownos.php b/plugins/knownos.php
index ee1b15a..77ccc81 100644
--- a/plugins/knownos.php
+++ b/plugins/knownos.php
@@ -50,36 +50,13 @@ function getKnownOSList()
 	
 	
 	// ubuntu bit for apt
-	$kos["apt"]["hardy"] = "Hardy Heron (8.04)";
-	$kos["apt"]["hardy-backports"] = "Hardy Heron (8.04) Backports";
-	$kos["apt"]["hardy-proposed"] = "Hardy Heron (8.04) Proposed";
-	$kos["apt"]["hardy-security"] = "Hardy Heron (8.04) Security";
-	$kos["apt"]["hardy-updates"] = "Hardy Heron (8.04) Updates";
+	// TODO uncomment these ones out of testing
+	$kos["apt"]["hardy"] = "Hardy Heron (8.04 LTS)";
 	$kos["apt"]["karmic"] = "Karmic Koala (9.10)";
-	$kos["apt"]["karmic-backports"] = "Karmic Koala (9.10) Backports";
-	$kos["apt"]["karmic-proposed"] = "Karmic Koala (9.10) Proposed";
-	$kos["apt"]["karmic-security"] = "Karmic Koala (9.10) Security";
-	$kos["apt"]["karmic-updates"] = "Karmic Koala (9.10) Updates";
 	$kos["apt"]["lucid"] = "Lucid Lynx (10.04 LTS)";
-	$kos["apt"]["lucid-backports"] = "Lucid Lynx (10.04 LTS) Backports";
-	$kos["apt"]["lucid-proposed"] = "Lucid Lynx (10.04 LTS) Proposed";
-	$kos["apt"]["lucid-security"] = "Lucid Lynx (10.04 LTS) Security";
-	$kos["apt"]["lucid-updates"] = "Lucid Lynx (10.04 LTS) Updates";
 	$kos["apt"]["maverick"] = "Maverick Meerkat (10.10)";
-	$kos["apt"]["maverick-backports"] = "Maverick Meerkat (10.10) Backports";
-	$kos["apt"]["maverick-proposed"] = "Maverick Meerkat (10.10) Proposed";
-	$kos["apt"]["maverick-security"] = "Maverick Meerkat (10.10) Security";
-	$kos["apt"]["maverick-updates"] = "Maverick Meerkat (10.10) Updates";
 	$kos["apt"]["natty"] = "Natty Narwhal (11.04)";
-	$kos["apt"]["natty-backports"] = "Natty Narwhal (11.04) Backports";
-	$kos["apt"]["natty-proposed"] = "Natty Narwhal (11.04) Proposed";
-	$kos["apt"]["natty-security"] = "Natty Narwhal (11.04) Security";
-	$kos["apt"]["natty-updates"] = "Natty Narwhal (11.04) Updates";
 	$kos["apt"]["oneiric"] = "Oneiric Ocelot (11.10)";
-	$kos["apt"]["oneiric-backports"] = "Oneiric Ocelot (11.10) Backports";
-	$kos["apt"]["oneiric-proposed"] = "Oneiric Ocelot (11.10) Proposed";
-	$kos["apt"]["oneiric-security"] = "Oneiric Ocelot (11.10) Security";
-	$kos["apt"]["oneiric-updates"] = "Oneiric Ocelot (11.10) Updates";
 	$kos["apt"]["lenny"] = "Debian Lenny";
 	$kos["apt"]["sid"] = "Debian Sid";
 	$kos["apt"]["squeeze"] = "Debian Squeeze";
@@ -105,6 +82,15 @@ function getKnownOSList()
 	$kos["arch"]["amd64_2"] = "amd64";
 	
 	
+	// package archs
+	$kos["pkgarch"]["i386"] = "i386";
+	$kos["pkgarch"]["x86_64"] = "x86_64";
+	$kos["pkgarch"]["noarch"] = "noarch";
+	
+	// package types
+	$kos["pkg"]["rpm"] = "RPM";
+	$kos["pkg"]["deb"] = "DEB";
+	
 	
 	return $kos;
 }