/[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 74 by atomo64-guest, Sun Dec 16 00:09:41 2007 UTC revision 76 by atomo64-guest, Sun Dec 16 00:49:38 2007 UTC
# Line 58  if (!function_exists('file_put_contents' Line 58  if (!function_exists('file_put_contents'
58      }      }
59  }  }
60    
61  if (in_array("-db_add",$argv))  db_add((isset($argv[2])?$argv[2]:''), false);  if (in_array("-db_add",$argv))  db_add((!empty($argv[2])?$argv[2]:''), false);
62      elseif (in_array("-db_query",$argv))  db_query($argv[2],(isset($argv[3])?$argv[3]:'%') );      elseif (in_array("-db_query",$argv))  db_query($argv[2],(!empty($argv[3])?$argv[3]:'%') );
63      elseif (in_array("-dl_diffs",$argv) || in_array("-keep_diff",$argv))  dl_diffs($argv[2]);      elseif (in_array("-dl_diffs",$argv) || in_array("-keep_diff",$argv))  dl_diffs($argv[2]);
64      elseif (in_array("-keep_sources",$argv) || in_array("-download_sources",$argv))  download_sources();      elseif (in_array("-keep_sources",$argv) || in_array("-download_sources",$argv))  download_sources();
65      elseif (in_array("-db_popcon",$argv))  db_popcon($argv[2]);      elseif (in_array("-db_popcon",$argv))  db_popcon($argv[2]);
# Line 73  if (in_array("-db_add",$argv))  db_add(( Line 73  if (in_array("-db_add",$argv))  db_add((
73      elseif (in_array("-clear_db",$argv))  clear_db();      elseif (in_array("-clear_db",$argv))  clear_db();
74      elseif (in_array("-db_up_error",$argv))  db_up_error();      elseif (in_array("-db_up_error",$argv))  db_up_error();
75      elseif (in_array("-up_changes",$argv))  up_changes($argv[2], true);      elseif (in_array("-up_changes",$argv))  up_changes($argv[2], true);
76      elseif (in_array("-watchf",$argv) || in_array("-wwiz",$argv))  watch_wizard((isset($argv[2])?$argv[2]:''));      elseif (in_array("-watchf",$argv) || in_array("-wwiz",$argv))  watch_wizard((!empty($argv[2])?$argv[2]:''));
77      elseif (in_array("-kb_total",$argv))  print "Diff      elseif (in_array("-kb_total",$argv))  print "Diff
78  #stat_up_error();  #stat_up_error();
79  #stat_up_error();to download Kb => " . kb_total($argv[2]) . "\n" ;  #stat_up_error();to download Kb => " . kb_total($argv[2]) . "\n" ;
# Line 445  function dl_popcon() { Line 445  function dl_popcon() {
445  }  }
446  function is_updated ($up_vers,$debian_vers) {  function is_updated ($up_vers,$debian_vers) {
447      if ($up_vers=='') return 0;      if ($up_vers=='') return 0;
448      passthru("dpkg --compare-versions '".escapeshellarg($up_vers)."' eq '" . escapeshellarg(vers_conv($debian_vers)) . "'",$great);      passthru("dpkg --compare-versions '".escapeshellarg($up_vers)."' le '" . escapeshellarg(vers_conv($debian_vers)) . "'",$great);
449      if ($great!=0) return 1;      if ($great!=0) return 1;
450      else return 0;      else return 0;
451  }  }
# Line 463  function db_upstream($initial='%') { Line 463  function db_upstream($initial='%') {
463          print "\rVersion=>" . $uscan_res[3];          print "\rVersion=>" . $uscan_res[3];
464          if ($uscan_res[3]!=null) $version=$uscan_res[3];          if ($uscan_res[3]!=null) $version=$uscan_res[3];
465          if ($uscan_res[5]!=null) $dversionmangled=$uscan_res[5];          if ($uscan_res[5]!=null) $dversionmangled=$uscan_res[5];
         #$updated=is_updated($uscan_res[0],$dversionmangled);  
466          $updated=$uscan_res[4];          $updated=$uscan_res[4];
467            if ($updated) {
468                $updated=is_updated($uscan_res[0],$dversionmangled);
469            }
470    
471          if (!$updated) {          if (!$updated) {
472              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']);
473          }          }
# Line 806  function watch_wizard($src_name='%'){ Line 809  function watch_wizard($src_name='%'){
809                      } else {                      } else {
810                          $keep_changes = 0;                          $keep_changes = 0;
811                      }                      }
812    
813                        $dversionmangled = $res_array[version];
814                        if ($uscan_res[5]!=null) $dversionmangled=$uscan_res[5];
815    
816                      $updated=$uscan_res[4];                      $updated=$uscan_res[4];
817                        if ($updated) {
818                            $updated=is_updated($uscan_res[0],$dversionmangled);
819                        }
820    
821                      if (!$updated) {                      if (!$updated) {
822                          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']);
823                      }                      }
                     $dversionmangled = $res_array[version];  
                     if ($uscan_res[5]!=null) $dversionmangled=$uscan_res[5];  
824    
825                      pg_exec($db, "UPDATE pkgs SET wwiz='" . pg_escape_string($watch) ."', wwiz_type='watch', wwiz_version='" . pg_escape_string($uscan_res[0]) . "',dversionmangled='".pg_escape_string($dversionmangled)."', up_url='" . pg_escape_string($uscan_res[2]) . "', keep_changes='$keep_changes', updated='$updated' where name='" . pg_escape_string($res_array[name]) . "' AND dist='" . $res_array[dist] ."'");                      pg_exec($db, "UPDATE pkgs SET wwiz='" . pg_escape_string($watch) ."', wwiz_type='watch', wwiz_version='" . pg_escape_string($uscan_res[0]) . "',dversionmangled='".pg_escape_string($dversionmangled)."', up_url='" . pg_escape_string($uscan_res[2]) . "', keep_changes='$keep_changes', updated='$updated' where name='" . pg_escape_string($res_array[name]) . "' AND dist='" . $res_array[dist] ."'");
826                  }                  }
Legend:
Removed from v.74  
changed lines
  Added in v.76
  ViewVC Help
Powered by ViewVC 1.1.5