/[dehs]/trunk/dehs_pg.php
ViewVC logotype

Diff of /trunk/dehs_pg.php

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 115 by atomo64-guest, Wed Feb 27 22:26:06 2008 UTC revision 116 by atomo64-guest, Sun Mar 2 23:14:01 2008 UTC
# Line 319  function md5_source($section,$dist) { Line 319  function md5_source($section,$dist) {
319      # 183dea9ca3c2e35ffd6cf5eee9501c21          2941637 main/binary-i386/Packages.gz      # 183dea9ca3c2e35ffd6cf5eee9501c21          2941637 main/binary-i386/Packages.gz
320  }  }
321    
322  function vers_conv($debvers) {  function vers_conv($debvers, $extendedConv) {
323      // Strip off the epoch      // Strip off the epoch
324      $pos = strpos($debvers, ':');      $pos = strpos($debvers, ':');
325      if ( $pos !== FALSE) {      if ( $pos !== FALSE) {
# Line 332  function vers_conv($debvers) { Line 332  function vers_conv($debvers) {
332          $debvers = substr($debvers, 0, $pos);          $debvers = substr($debvers, 0, $pos);
333      }      }
334    
335      // strip off repacking indicators      if ($extendedConv) {
336      $debvers = preg_replace("/[-.+~]?(ds|dfsg|debian)(.*)/i", "", $debvers);          // strip off repacking indicators
337            $debvers = preg_replace("/[-.+~]?(ds|dfsg|debian)(.*)/i", "", $debvers);
338        }
339    
340      return $debvers;      return $debvers;
341  }  }
342  function check_db() {  function check_db() {
# Line 352  function check_db() { Line 355  function check_db() {
355      }      }
356      if (!pg_table_exists($db, "events")) {      if (!pg_table_exists($db, "events")) {
357          pg_exec($db, "CREATE TABLE events (id serial PRIMARY KEY, name text,type text, dist text, stamp timestamp, content text)") or die_status('Error creating table binpkgs\n');          pg_exec($db, "CREATE TABLE events (id serial PRIMARY KEY, name text,type text, dist text, stamp timestamp, content text)") or die_status('Error creating table binpkgs\n');
358          pg_exec($db, "CREATE UNIQUE INDEX idxevents on events (name,dist)") or die_status('Errore creating index - ' . pg_last_error($db));          pg_exec($db, "CREATE UNIQUE INDEX idxevents on events (name,dist,content)") or die_status('Errore creating index - ' . pg_last_error($db));
359          pg_exec($db, "CREATE INDEX pkgxeventtype on events (name,type,dist)") or die_status('Errore creating index - ' . pg_last_error($db));          pg_exec($db, "CREATE INDEX pkgxeventtype on events (name,type,dist)") or die_status('Errore creating index - ' . pg_last_error($db));
360          $sw=true;          $sw=true;
361      }      }
# Line 449  function dl_popcon() { Line 452  function dl_popcon() {
452  function is_updated ($up_vers,$debian_vers, $dversionAsIs = false) {  function is_updated ($up_vers,$debian_vers, $dversionAsIs = false) {
453      if ($up_vers=='') return 1;      if ($up_vers=='') return 1;
454    
455        $extendedConv = true;
456    
457      if ($up_vers === $debian_vers) $dversionAsIs = true;      if ($up_vers === $debian_vers) $dversionAsIs = true;
458    
459      passthru("dpkg --compare-versions '".escapeshellarg($up_vers)."' le '" . escapeshellarg($dversionAsIs?$debian_vers:vers_conv($debian_vers)) . "'",$great);      if (strpos(strtolower($up_vers), 'dfsg') !== false && strpos(strtolower($debian_vers), 'dfsg') !== false) {
460            $extendedConv = false;
461        }
462    
463        passthru("dpkg --compare-versions '".escapeshellarg($up_vers)."' le '" . escapeshellarg($dversionAsIs?$debian_vers:vers_conv($debian_vers, $extendedConv)) . "'",$great);
464    
465      return (int)!($great);      return (int)!($great);
466  }  }
# Line 492  function db_upstream($initial='%', $chec Line 501  function db_upstream($initial='%', $chec
501              $mangle = false;              $mangle = false;
502          }          }
503    
504            $up_url=iconv("ISO-8859-1","UTF-8",$uscan_res[2]);
505            $up_version=iconv("ISO-8859-1","UTF-8",$uscan_res[0]);
506    
507          $updated = $uscan_res[4];          $updated = $uscan_res[4];
508    
509          /*if (!$updated)*/ {          /*if (!$updated)*/ {
# Line 499  function db_upstream($initial='%', $chec Line 511  function db_upstream($initial='%', $chec
511          }          }
512    
513          if (!$updated) {          if (!$updated) {
514              events::newVersion($res_array['name'], $res_array['version'], $uscan_res[0], $res_array['dist']);              events::newVersion($res_array['name'], $res_array['version'], $uscan_res[0], $res_array['dist'], $up_url);
515          } else {          } else {
516              $lastupvsdebsync = sqldate();              $lastupvsdebsync = sqldate();
517          }          }
# Line 511  function db_upstream($initial='%', $chec Line 523  function db_upstream($initial='%', $chec
523          if ($uscan_res[0]!=$res_array[up_version]) ($keep_changes=1);          if ($uscan_res[0]!=$res_array[up_version]) ($keep_changes=1);
524          else $keep_changes=0;          else $keep_changes=0;
525    
         $up_url=iconv("ISO-8859-1","UTF-8",$uscan_res[2]);  
         $up_version=iconv("ISO-8859-1","UTF-8",$uscan_res[0]);  
   
526          $watch_warn='';          $watch_warn='';
527          if($uscan_res[1] != null) {          if($uscan_res[1] != null) {
528              $watch_warn=pg_escape_string(iconv("ISO-8859-1","UTF-8", $uscan_res[1]));              $watch_warn=pg_escape_string(iconv("ISO-8859-1","UTF-8", $uscan_res[1]));
Legend:
Removed from v.115  
changed lines
  Added in v.116
  ViewVC Help
Powered by ViewVC 1.1.5