r9221 - in /scripts/qa: DebianQA/Svn.pm DebianQA/Watch.pm qareport qareport.cgi templates/by_category
tincho-guest at users.alioth.debian.org
tincho-guest at users.alioth.debian.org
Mon Nov 12 01:31:34 UTC 2007
Author: tincho-guest
Date: Mon Nov 12 01:31:34 2007
New Revision: 9221
URL: http://svn.debian.org/wsvn/?sc=1&rev=9221
Log:
/unmangle/mangle/gi :-)
Modified:
scripts/qa/DebianQA/Svn.pm
scripts/qa/DebianQA/Watch.pm
scripts/qa/qareport
scripts/qa/qareport.cgi
scripts/qa/templates/by_category
Modified: scripts/qa/DebianQA/Svn.pm
URL: http://svn.debian.org/wsvn/scripts/qa/DebianQA/Svn.pm?rev=9221&op=diff
==============================================================================
--- scripts/qa/DebianQA/Svn.pm (original)
+++ scripts/qa/DebianQA/Svn.pm Mon Nov 12 01:31:34 2007
@@ -164,9 +164,9 @@
next;
}
my @versions = sort({ deb_compare_nofail($a, $b) }
- grep(defined, map({ $_->{unmangled_ver} } @$watch)));
-
- $svn{$dir}{unmangled_ver} = $versions[-1];
+ grep(defined, map({ $_->{mangled_ver} } @$watch)));
+
+ $svn{$dir}{mangled_ver} = $versions[-1];
$svn{$dir}{watch} = $watch;
# Again for unreleased
@@ -175,8 +175,8 @@
# Returns undef on error
if($watch and @$watch) {
@versions = sort({ deb_compare_nofail($a, $b) }
- grep(defined, map({ $_->{unmangled_ver} } @$watch)));
- $svn{$dir}{unmangled_un_ver} = $versions[-1];
+ grep(defined, map({ $_->{mangled_ver} } @$watch)));
+ $svn{$dir}{mangled_un_ver} = $versions[-1];
}
}
# Retain lock
@@ -276,21 +276,21 @@
push @{$opts{$k}}, $v;
}
}
- my $unmangled = $version;
+ my $mangled = $version;
if($version and $opts{dversionmangle}) {
foreach(split(/;/, join(";", @{$opts{dversionmangle}}))) {
- debug("Executing \$unmangled =~ $_");
- eval "\$unmangled =~ $_";
+ debug("Executing \$mangled =~ $_");
+ eval "\$mangled =~ $_";
if($@) {
error("Invalid watchfile: $@");
return undef;
}
}
}
- debug("Unmangled version: $unmangled");
+ debug("Mangled version: $mangled");
push @wspecs, {
line => $_,
- unmangled_ver => $unmangled,
+ mangled_ver => $mangled,
md5 => md5_hex(($opts || "").$_),
opts => \%opts
};
Modified: scripts/qa/DebianQA/Watch.pm
URL: http://svn.debian.org/wsvn/scripts/qa/DebianQA/Watch.pm?rev=9221&op=diff
==============================================================================
--- scripts/qa/DebianQA/Watch.pm (original)
+++ scripts/qa/DebianQA/Watch.pm Mon Nov 12 01:31:34 2007
@@ -77,14 +77,14 @@
} else {
info("Found: version $uscand{upstream_version} ",
"from $uscand{upstream_url} ",
- "(unmangled: $uscand{upstream_unmangled})");
+ "(mangled: $uscand{upstream_mangled})");
}
$watch{$md5} = { watch_error => $watcherr, %uscand };
}
my $diff;
- if($watch{$md5}{upstream_unmangled}) {
- $diff = deb_compare($wline->{unmangled_ver},
- $watch{$md5}{upstream_unmangled});
+ if($watch{$md5}{upstream_mangled}) {
+ $diff = deb_compare($wline->{mangled_ver},
+ $watch{$md5}{upstream_mangled});
$watch{$md5}{watch_error} = "InvalidVersion" unless(
defined $diff);
} else {
@@ -94,8 +94,8 @@
}
my @noerror = grep({ not $_->{watch_error} } @wresult);
@noerror = sort({
- deb_compare_nofail($a->{upstream_unmangled},
- $b->{upstream_unmangled}) } @noerror);
+ deb_compare_nofail($a->{upstream_mangled},
+ $b->{upstream_mangled}) } @noerror);
unless(@noerror) {
$watch2{$pkg} = { error => $wresult[0]{watch_error} };
next;
@@ -177,13 +177,13 @@
return("Invalid");
}
}
- debug("Unmangled version: $mangled[-1]");
+ debug("Mangled version: $mangled[-1]");
}
my @order = sort({ deb_compare_nofail($mangled[$a], $mangled[$b]) }
(0..$#vers));
return(undef,
%{$vers[$order[-1]]},
- upstream_unmangled => $mangled[$order[-1]]);
+ upstream_mangled => $mangled[$order[-1]]);
}
sub recurse_dirs($$$);
sub recurse_dirs($$$) {
Modified: scripts/qa/qareport
URL: http://svn.debian.org/wsvn/scripts/qa/qareport?rev=9221&op=diff
==============================================================================
--- scripts/qa/qareport (original)
+++ scripts/qa/qareport Mon Nov 12 01:31:34 2007
@@ -43,12 +43,12 @@
my $werr = $data->{watch}{$pkg}{error};
my $dver = $data->{svn}{$pkg}{version} || 0;
my $dwerr = $data->{svn}{$pkg}{watch_error};
- my $m_dver = $data->{svn}{$pkg}{unmangled_ver} || 0;
+ my $m_dver = $data->{svn}{$pkg}{mangled_ver} || 0;
my $undver = $data->{svn}{$pkg}{un_version};
my $archver = $data->{archive}{$pkg}{most_recent} || 0;
my $archsuit = $data->{archive}{$pkg}{most_recent_src} || 0;
my $uver = $data->{watch}{$pkg}{upstream_version};
- my $u_uver = $data->{watch}{$pkg}{upstream_unmangled};
+ my $u_uver = $data->{watch}{$pkg}{upstream_mangled};
my $uurl = $data->{watch}{$pkg}{upstream_url};
my @bugs = map({ "#$_" } keys %{$data->{bts}{$pkg}});
Modified: scripts/qa/qareport.cgi
URL: http://svn.debian.org/wsvn/scripts/qa/qareport.cgi?rev=9221&op=diff
==============================================================================
--- scripts/qa/qareport.cgi (original)
+++ scripts/qa/qareport.cgi Mon Nov 12 01:31:34 2007
@@ -50,13 +50,13 @@
my $werr = $data->{watch}{$pkg}{error};
my $dver = $data->{svn}{$pkg}{version} || 0;
my $dwerr = $data->{svn}{$pkg}{watch_error};
- my $m_dver = $data->{svn}{$pkg}{unmangled_ver} || 0;
- my $m_uver = $data->{svn}{$pkg}{unmangled_un_ver} || 0;
+ my $m_dver = $data->{svn}{$pkg}{mangled_ver} || 0;
+ my $m_uver = $data->{svn}{$pkg}{mangled_un_ver} || 0;
my $undver = $data->{svn}{$pkg}{un_version};
my $archver = $data->{archive}{$pkg}{most_recent} || 0;
my $archsuit = $data->{archive}{$pkg}{most_recent_src} || 0;
my $uver = $data->{watch}{$pkg}{upstream_version};
- my $u_uver = $data->{watch}{$pkg}{upstream_unmangled} || 0;
+ my $u_uver = $data->{watch}{$pkg}{upstream_mangled} || 0;
my $uurl = $data->{watch}{$pkg}{upstream_url};
my @bugs = sort keys %{$data->{bts}{$pkg}};
Modified: scripts/qa/templates/by_category
URL: http://svn.debian.org/wsvn/scripts/qa/templates/by_category?rev=9221&op=diff
==============================================================================
--- scripts/qa/templates/by_category (original)
+++ scripts/qa/templates/by_category Mon Nov 12 01:31:34 2007
@@ -78,10 +78,10 @@
<td>[% INCLUDE bts_link pkg=pkg %]</td>
<td[% IF pkg.todo.upstream %] class="todo"[% END %]><a href="[% IF
- pkg.watch.upstream_unmangled %][% pkg.watch.upstream_url | html
+ pkg.watch.upstream_mangled %][% pkg.watch.upstream_url | html
%][% ELSE %][% "${pkg.name}" | format("$wsvn_url")
%]/debian/watch?op=file&rev=0&sc=0[% END %]">[%
- pkg.watch.upstream_unmangled || pkg.watch.error
+ pkg.watch.upstream_mangled || pkg.watch.error
%]</a></td>
</tr>
[% END #BLOCK package %]
More information about the Pkg-perl-cvs-commits
mailing list