[Dehs-devel] r102 - trunk

atomo64-guest at alioth.debian.org atomo64-guest at alioth.debian.org
Tue Jan 29 23:13:39 UTC 2008


Author: atomo64-guest
Date: 2008-01-29 23:13:39 +0000 (Tue, 29 Jan 2008)
New Revision: 102

Modified:
   trunk/dehs_pg.php
   trunk/update_wwwal.sh
Log:
update_wwwall.sh: generate the information for the DEHS-DDPOMail robot integration
dehs_pg.php: make sure the database is completely 'cleared' (clear_db) on all calls
Don't call vers_conv when using the mangled Debian version nor when up_vers=debian_vers (possible uversion mangling by watch file)


Modified: trunk/dehs_pg.php
===================================================================
--- trunk/dehs_pg.php	2008-01-29 01:26:15 UTC (rev 101)
+++ trunk/dehs_pg.php	2008-01-29 23:13:39 UTC (rev 102)
@@ -168,7 +168,7 @@
     print "Download Diff.gz of package $pkg => Fallito\n";
     return false;
 }
-function db_add($initial='', $clear_db = true) {
+function db_add($initial='') {
     global $dirs,$dists,$dbconn;
     check_db();
     download_sources();
@@ -240,7 +240,7 @@
             gzclose($zp) ;
         }
     }
-    clear_db($db, $clear_db);
+    clear_db($db);
     pg_close($db);
 }
 function db_query($pkg,$dist='%') {
@@ -392,7 +392,7 @@
     #else
     return "/debian/dists";
 }
-function clear_db(&$db, $fullClean = true) {
+function clear_db(&$db) {
     #global $dbconn;
     #if (check_db()) die_status("Il Database era vuoto\n");
     #download_sources();
@@ -400,9 +400,9 @@
     $sql1=	"Delete from binpkgs where id NOT IN
 			(select id FROM binpkgs INNER JOIN bin_atsrc USING (name,bin_name,dist))" ;
     $sql2=	"Delete from pkgs where id NOT IN (select id FROM pkgs INNER JOIN pkgs_atsrc USING (name,dist))" ;
-    $sql3=	"UPDATE pkgs SET wwiz=NULL, wwiz_type=NULL, wwiz_version=NULL WHERE watch IS NOT NULL or watch!=''" ;
-    $sql4=	"UPDATE pkgs SET up_changes=NULL WHERE wwiz_version=up_version OR up_version=version" ;
-    if(pg_exec($db,$sql1) && pg_exec($db,$sql2) && (!$fullClean || (pg_exec($db,$sql3) && pg_exec($db,$sql4)))) {
+    $sql3=	"UPDATE pkgs SET wwiz=NULL, wwiz_type=NULL, wwiz_version=NULL WHERE watch IS NOT NULL and watch!=''" ;
+    $sql4=	"UPDATE pkgs SET up_changes=NULL WHERE updated='1'";
+    if(pg_exec($db,$sql1) && pg_exec($db,$sql2) && pg_exec($db,$sql3) && pg_exec($db,$sql4)) {
         print "Db clear complete\n";
     }
 }
@@ -446,9 +446,13 @@
     $remotefile="http://popcon.debian.org/all-popcon-results.txt.gz";
     @file_put_contents($localfile,file_get_contents($remotefile),'w') or die_status("Errore nello scaricare il file popcon\n");
 }
-function is_updated ($up_vers,$debian_vers) {
+function is_updated ($up_vers,$debian_vers, $dversionAsIs = false) {
     if ($up_vers=='') return 1;
-    passthru("dpkg --compare-versions '".escapeshellarg($up_vers)."' le '" . escapeshellarg(vers_conv($debian_vers)) . "'",$great);
+
+    if ($up_vers === $debian_vers) $dversionAsIs = true;
+
+    passthru("dpkg --compare-versions '".escapeshellarg($up_vers)."' le '" . escapeshellarg($dversionAsIs?$debian_vers:vers_conv($debian_vers)) . "'",$great);
+
     return (int)!($great);
 }
 function db_upstream($initial='%', $checkStamps = false, $limit = null) {
@@ -487,7 +491,7 @@
         $updated = $uscan_res[4];
 
         /*if (!$updated)*/ {
-            $updated=is_updated($uscan_res[0], $dversionmangled);
+            $updated=is_updated($uscan_res[0], $dversionmangled, $dversionmangled != $version);
         }
 
         if (!$updated) {
@@ -854,7 +858,7 @@
 
                     $updated = $uscan_res[4];
                     /*if ($updated)*/ {
-                        $updated = is_updated($uscan_res[0], $dversionmangled);
+                        $updated = is_updated($uscan_res[0], $dversionmangled, $dversionmangled != $uscan_res[5]);
                     }
 
                     /*if (!$updated) {
@@ -949,7 +953,7 @@
     global $email_all;
     $intime=gmdate('D, d M Y H:i:s \C\E\S\T',time()+3600*2);
     echo __FUNCTION__ . ' started the ' . $intime . "\n";
-    db_add('',false);
+    db_add();
     dl_popcon();
     db_popcon();
 

Modified: trunk/update_wwwal.sh
===================================================================
--- trunk/update_wwwal.sh	2008-01-29 01:26:15 UTC (rev 101)
+++ trunk/update_wwwal.sh	2008-01-29 23:13:39 UTC (rev 102)
@@ -14,9 +14,10 @@
     psql -A -q -d dehs -c "SELECT name || ': Error' FROM pkgs WHERE up_version='' AND watch!='' AND dist='unstable' order by name asc;" | egrep -v '\?column\?|rows\)'  > /org/alioth.debian.org/chroot/home/groups/dehs/htdocs/no_upstream.txt
     psql -A -q -d dehs -c "SELECT name || ': ' || up_version FROM pkgs WHERE up_version!='' AND watch!='' AND dist='unstable' AND updated='0' order by name asc;" | egrep -v '\?column\?|rows\)'  > /org/alioth.debian.org/chroot/home/groups/dehs/htdocs/no_updated.txt
     psql -A -q -d dehs -c "SELECT name || ': N/A' FROM pkgs WHERE watch IS NULL OR watch=''  AND dist='unstable' UNION SELECT name || ': Error' FROM pkgs WHERE up_version='' AND watch!='' AND dist='unstable' UNION SELECT name || ': ' || up_version FROM pkgs WHERE up_version!='' AND watch!='' AND dist='unstable';" | egrep -v '\?column\?|rows\)'  > /org/alioth.debian.org/chroot/home/groups/dehs/htdocs/dehs_debianqa.txt
+    psql -A -q -d dehs -c "SELECT name,version,up_version,lastupvsdebsync FROM pkgs WHERE up_version!='' AND up_version IS NOT NULL AND watch!='' AND watch IS NOT NULL AND updated='0'" | egrep -v '\?column\?|rows\)' | grep -v 'name|version|up_version|lastupvsdebsync' > /org/alioth.debian.org/chroot/home/groups/dehs/htdocs/ddpomail.txt
 fi
 
-STATS=/org/alioth.debian.org/chroot/home/groups/dehs/htdocs/dehs_stats.txt
+STATS=/org/alioth.debian.org/chroot/home/groups/dehs/htdocs/stats.txt
 cat /dev/null > $STATS.new
 echo -n 'watch_count:' >> $STATS.new
 psql -A -q -d dehs -c "SELECT COUNT(id) FROM pkgs WHERE watch!='';" | egrep -v '[^0-9]' >> $STATS.new




More information about the Dehs-devel mailing list