r3006 - people/goneri/SvnBuildStat-WWW/script

[Gonéri Le Bouder]

Author: goneri-guest
Date: 2007-06-20 11:43:12 +0000 (Wed, 20 Jun 2007)
New Revision: 3006

Modified:
   people/goneri/SvnBuildStat-WWW/script/svnbuildstat_update-db.pl
Log:
set isnative as true is the package is native...


Modified: people/goneri/SvnBuildStat-WWW/script/svnbuildstat_update-db.pl
===================================================================
--- people/goneri/SvnBuildStat-WWW/script/svnbuildstat_update-db.pl	2007-06-20 11:34:05 UTC (rev 3005)
+++ people/goneri/SvnBuildStat-WWW/script/svnbuildstat_update-db.pl	2007-06-20 11:43:12 UTC (rev 3006)
@@ -73,32 +73,37 @@
 
   my $isindebian = 'f';
   my $tarballuri;
+  my $isnative = 'f';
 
   my $ua = LWP::UserAgent->new;
   $ua->agent("SvnBuildStat/0.1 ");
 
-  my $debmirror = 'http://ftp.debian.org/debian';
-  my $debdiff .= $$package->name."_".$$package->svndebrelease.".diff.gz";
-  my $tarball = mkTarballFromPackage($package);
+  if ($$package->svndebrelease !~ /-[\d\.]+$/) {
+    print $$package->name."\n";
+    $isnative = 't';
+  } else {
+    my $debmirror = 'http://ftp.debian.org/debian';
+    my $debdiff .= $$package->name."_".$$package->svndebrelease.".diff.gz";
+    my $tarball = mkTarballFromPackage($package);
 
-  if ($tarball) {
-    foreach my $section (qw/main contrib non-free/) {
-      my $tmp = "$1/".$$package->name if $$package->name =~ /^(lib.|.)/;
-      my $debdiffuri = $debmirror.'/pool/'.$section.'/'.$tmp.'/'.$debdiff;
-      my $tmp_tarballuri = $debmirror.'/pool/'.$section.'/'.$tmp.'/'.$tarball;
-      print $tmp_tarballuri."\n";
-      if (testUrl($debdiffuri)) {
-	$isindebian = 't';
+    if ($tarball) {
+      foreach my $section (qw/main contrib non-free/) {
+	my $tmp = "$1/".$$package->name if $$package->name =~ /^(lib.|.)/;
+	my $debdiffuri = $debmirror.'/pool/'.$section.'/'.$tmp.'/'.$debdiff;
+	my $tmp_tarballuri = $debmirror.'/pool/'.$section.'/'.$tmp.'/'.$tarball;
+	print $tmp_tarballuri."\n";
+	if (testUrl($debdiffuri)) {
+	  $isindebian = 't';
+	}
+	if (testUrl($tmp_tarballuri)) {
+	  $tarballuri = $tmp_tarballuri;
+	  $tarballuri =~ s/^$debmirror/\@DEBMIRROR@/;
+	}
       }
-      if (testUrl($tmp_tarballuri)) {
-	$tarballuri = $tmp_tarballuri;
-	$tarballuri =~ s/^$debmirror/\@DEBMIRROR@/;
-      }
     }
-
   }
-print "tarballuri -> ".$tarballuri."\n";
-  return { tarballuri => $tarballuri, isindebian => $isindebian };
+  print "tarballuri -> ".$tarballuri."\n";
+  return { tarballuri => $tarballuri, isindebian => $isindebian, isnative => $isnative };
 }
 
 sub getUscanData {
@@ -215,24 +220,31 @@
   my $ondebiandata = getOnDebianData(\$package);
   my $tarballurlfromtarballlayout = createTarballUrlFromTarballlayout($repository,\$package);
   # Is the tarball on a Debian mirror?
-  if ($ondebiandata->{tarballuri}) {
-    $package->tarballuri($ondebiandata->{tarballuri});
-    $package->istarballpresent(1);
-    # Or on upstream repository (using uscan)
-  } elsif($uscandata->{tarballuri}) {
-    $package->tarballuri($uscandata->{tarballuri});
-    $package->istarballpresent(1);
-    # Or on a HTTP/FTP space is a tarball layout exists
-  } elsif (testUrl($tarballurlfromtarballlayout)) {
-    $package->tarballuri($tarballurlfromtarballlayout);
-    $package->istarballpresent(1);
-    # Or on the same repository
-  } elsif(exists $tarballonrepository->{$tarball}) {
-    my $t = $tarballonrepository->{$tarball};
-    $t =~ s!svn://svn.debian.org/svn/(.*)!http://svn.debian.org/wsvn/$1?op=file&rev=0&sc=0!;
-  } else {
+  if ($ondebiandata->{isnative} eq 't') {
+    $package->isnative(1);
     $package->tarballuri('');
     $package->istarballpresent(0);
+  } else {
+      $package->isnative(0);
+    if ($ondebiandata->{tarballuri}) {
+      $package->tarballuri($ondebiandata->{tarballuri});
+      $package->istarballpresent(1);
+      # Or on upstream repository (using uscan)
+    } elsif($uscandata->{tarballuri}) {
+      $package->tarballuri($uscandata->{tarballuri});
+      $package->istarballpresent(1);
+      # Or on a HTTP/FTP space is a tarball layout exists
+    } elsif (testUrl($tarballurlfromtarballlayout)) {
+      $package->tarballuri($tarballurlfromtarballlayout);
+      $package->istarballpresent(1);
+      # Or on the same repository
+    } elsif(exists $tarballonrepository->{$tarball}) {
+      my $t = $tarballonrepository->{$tarball};
+      $t =~ s!svn://svn.debian.org/svn/(.*)!http://svn.debian.org/wsvn/$1?op=file&rev=0&sc=0!;
+    } else {
+      $package->tarballuri('');
+      $package->istarballpresent(0);
+    }
   } 
 
   #