summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2010-08-01 13:20:32 +0200
committerRemi Collet <fedora@famillecollet.com>2010-08-01 13:20:32 +0200
commit6d2954c5e9da8cd36c231114df5184d4a3101ddd (patch)
tree14a37f46506e26f601b7fd0e077e85f305be7caa
parent007e432970439dfb0d6bf6eb89ab3703dc98a596 (diff)
parent8aebf3179ed6b21d638218985922dc96fdcbb3c3 (diff)
Merge http://github.com/trasher/rpmphp
-rw-r--r--all.php2
-rw-r--r--install.txt2
-rw-r--r--scripts/rpmphp.js3
-rw-r--r--zoom.php8
4 files changed, 3 insertions, 12 deletions
diff --git a/all.php b/all.php
index 8e42e46..6976dc5 100644
--- a/all.php
+++ b/all.php
@@ -110,7 +110,7 @@ function report ($db)
if (isset($rpms[$repo->main."-".$repo->sub])) {
$rpm=$rpms[$repo->main."-".$repo->sub];
- $maxver = (isset($rpms["rawhide-"]) ? $rpms["rawhide-"]->ver : "");
+ $maxver = (isset($rpms["devel-"]) ? $rpms["devel-"]->ver : "");
switch ($repo->sub) {
case "base":
diff --git a/install.txt b/install.txt
index 65a6a67..a9a1fe4 100644
--- a/install.txt
+++ b/install.txt
@@ -84,7 +84,7 @@ $distros=array(
array("main"=>"F-9", "sub"=>"updates", "repo"=>"http://download.fedora.redhat.com/pub/fedora/linux/updates/9/x86_64/"),
array("main"=>"F-9", "sub"=>"testing", "repo"=>"http://download.fedora.redhat.com/pub/fedora/linux/updates/testing/9/x86_64/"),
- array("main"=>"rawhide", "sub"=>"", "repo"=>"http://download.fedora.redhat.com/pub/fedora/linux/development/x86_64/os/")
+ array("main"=>"devel", "sub"=>"", "repo"=>"http://download.fedora.redhat.com/pub/fedora/linux/development/x86_64/os/")
);
Action("CREATE TABLE `repo` (
diff --git a/scripts/rpmphp.js b/scripts/rpmphp.js
index 6723438..91f4fb9 100644
--- a/scripts/rpmphp.js
+++ b/scripts/rpmphp.js
@@ -35,9 +35,6 @@ function initZoomJS(name)
data,
function(k, v){
_data = data[k];
- if ( k === 'devel' ) {
- k = 'rawhide';
- }
_owner_cell = $('#pkgdb_' + k + '_owner');
if ( _owner_cell ) {
_owner_cell.empty().text(_data.owner);
diff --git a/zoom.php b/zoom.php
index 0a1c2e1..11bf489 100644
--- a/zoom.php
+++ b/zoom.php
@@ -67,13 +67,7 @@ function getBranchPeople($params)
$branch = $people = null; // avoid IDE warning
extract($params);
$ret = null;
- if ($branch == 'rawhide' && isset($fedpkg['devel']['owner']) ) {
- if ( !$people || $people == '' || $people == 'owner' ) {
- $ret = $fedpkg['devel']['owner'];
- } else if ( $people == 'people') {
- $ret_tmp = $fedpkg['devel']['people'];
- }
- } else if (isset($fedpkg[$branch]['owner'])) {
+ if (isset($fedpkg[$branch]['owner'])) {
if ( !$people || $people == '' || $people == 'owner' ) {
$ret = $fedpkg[$branch]['owner'];
} else if ( $people == 'people') {