[Dehs-devel] r79 - in trunk: . www
atomo64-guest at alioth.debian.org
atomo64-guest at alioth.debian.org
Mon Dec 17 00:08:14 UTC 2007
Author: atomo64-guest
Date: 2007-12-17 00:08:14 +0000 (Mon, 17 Dec 2007)
New Revision: 79
Modified:
trunk/dehs_pg.php
trunk/www/maintainer.php
trunk/www/menu.inc
Log:
dehs_pg.php: only update the dversionmangled field when the 'mangled' one only differs by revision and/or epoch
www/maintainer.php: Fix the link to popcon.php by using the package name instead of the popcon value
www/menu.inc: restore the maintainer.php search fields
Modified: trunk/dehs_pg.php
===================================================================
--- trunk/dehs_pg.php 2007-12-16 23:37:18 UTC (rev 78)
+++ trunk/dehs_pg.php 2007-12-17 00:08:14 UTC (rev 79)
@@ -450,7 +450,7 @@
$dversionmangled=$res_array['dversionmangled'];
print "\rVersion=>" . $uscan_res[3];
if ($uscan_res[3]!=null) $version=$uscan_res[3];
- if ($uscan_res[5]!=null) $dversionmangled=$uscan_res[5];
+ if ($uscan_res[5]!=null && $uscan_res[5] != vers_conv($res_array['version'])) $dversionmangled=$uscan_res[5];
$updated=$uscan_res[4];
if ($updated) {
$updated=is_updated($uscan_res[0],$dversionmangled);
@@ -799,7 +799,7 @@
}
$dversionmangled = $res_array[version];
- if ($uscan_res[5]!=null) $dversionmangled=$uscan_res[5];
+ if ($uscan_res[5]!=null && $uscan_res[5] != vers_conv($res_array['version'])) $dversionmangled=$uscan_res[5];
$updated=$uscan_res[4];
if ($updated) {
Modified: trunk/www/maintainer.php
===================================================================
--- trunk/www/maintainer.php 2007-12-16 23:37:18 UTC (rev 78)
+++ trunk/www/maintainer.php 2007-12-17 00:08:14 UTC (rev 79)
@@ -98,7 +98,7 @@
<ul>
<li><b>Name:</b> <a href="http://packages.qa.debian.org/<?=$res_array['name']?>"><? print $res_array["name"]; ?></a></li>
<ul>
-<li><b>Pop Inst:</b> <a href="http://qa.debian.org/popcon.php?package=<?=$res_array['mpop_inst']?>"><? print $res_array["mpop_inst"]; ?></a></li>
+<li><b>Pop Inst:</b> <a href="http://qa.debian.org/popcon.php?package=<?=$res_array['name']?>"><? print $res_array["mpop_inst"]; ?></a></li>
<? if ($key=="no_watch") { ?>
<li><b>WWiz Upstream Version:</b>
<? if ($res_array["wwiz_version"]) {?>
Modified: trunk/www/menu.inc
===================================================================
--- trunk/www/menu.inc 2007-12-16 23:37:18 UTC (rev 78)
+++ trunk/www/menu.inc 2007-12-17 00:08:14 UTC (rev 79)
@@ -1,7 +1,34 @@
-<div style="text-align: center;">
-<br><a href="no_watch.html">Pkgs without Watch file</a><br>
-<a href="no_upstream.html">Pkgs with Watch file but no upstream version
-checkable</a><br>
-<a href="no_updated.html">Pkgs not in sync with Upstream Author version</a><br>
-<a href="stats.html">DEHS statistics</a><br>
-</div><br>
+<br>
+<div style="text-align: center;display:table;">
+ <div style="display:table-row;">
+ <div style="display:table-cell;">
+ <a href="no_watch.html">Pkgs without watch file</a>
+ </div>
+ <div style="display:table-cell;">
+ <a href="no_updated.html">Pkgs not in sync with upstream</a>
+ </div>
+ </div>
+ <div style="display:table-row;">
+ <div style="display:table-cell;">
+ <a href="no_upstream.html">Pkgs with watch file but no upstream version checkable</a>
+ </div>
+ <div style="display:table-cell;">
+ <a href="stats.html">DEHS statistics</a>
+ </div>
+ </div>
+ <div style="display:table-row;">
+ <div style="display:table-cell;">
+ <form action="/maintainer.php" method="post">
+ Maintainer packages status <input type="text" name="maint" value="foo at bar.com" onclick="this.value=(this.value=='foo at bar.com')?'':this.value;"/>
+ <input type="submit" value="Display">
+ </form>
+ </div>
+ <div style="display:table-cell;">
+ <form action="/maintainer.php" method="post">
+ Status for package <input type="text" name="name" value="libfoo" onclick="this.value=(this.value=='libfoo')?'':this.value;"/>
+ <input type="submit" value="Display">
+ </form>
+ </div>
+ </div>
+</div>
+<br>
\ No newline at end of file
More information about the Dehs-devel
mailing list