Blame rpm-4.4.2-perlmainprov.patch
|
Paul Nasrat |
56db76 |
--- rpm-4.4.2/scripts/perl.prov.main 2006-01-18 11:32:28.000000000 -0500
|
|
Paul Nasrat |
56db76 |
+++ rpm-4.4.2/scripts/perl.prov 2006-01-18 11:32:44.000000000 -0500
|
|
Paul Nasrat |
56db76 |
@@ -121,13 +121,17 @@
|
|
Paul Nasrat |
56db76 |
}
|
|
Paul Nasrat |
56db76 |
|
|
Paul Nasrat |
56db76 |
# not everyone puts the package name of the file as the first
|
|
Paul Nasrat |
56db76 |
- # package name so we report all namespaces as if they were
|
|
Paul Nasrat |
56db76 |
- # provided packages (really ugly).
|
|
Paul Nasrat |
56db76 |
+ # package name so we report all namespaces except some common
|
|
Paul Nasrat |
56db76 |
+ # false positives as if they were provided packages (really ugly).
|
|
Paul Nasrat |
56db76 |
|
|
Paul Nasrat |
56db76 |
if (m/^\s*package\s+([_:a-zA-Z0-9]+)\s*;/) {
|
|
Paul Nasrat |
56db76 |
$package=$1;
|
|
Paul Nasrat |
56db76 |
undef $version;
|
|
Paul Nasrat |
56db76 |
- $require{$package}=undef;
|
|
Paul Nasrat |
56db76 |
+ if ($package eq 'main') {
|
|
Paul Nasrat |
56db76 |
+ undef $package;
|
|
Paul Nasrat |
56db76 |
+ } else {
|
|
Paul Nasrat |
56db76 |
+ $require{$package}=undef;
|
|
Paul Nasrat |
56db76 |
+ }
|
|
Paul Nasrat |
56db76 |
}
|
|
Paul Nasrat |
56db76 |
|
|
Paul Nasrat |
56db76 |
# after we found the package name take the first assignment to
|
|
Paul Nasrat |
56db76 |
--- rpm-4.4.2/scripts/perldeps.pl.main 2006-01-18 11:32:37.000000000 -0500
|
|
Paul Nasrat |
56db76 |
+++ rpm-4.4.2/scripts/perldeps.pl 2006-01-18 11:32:44.000000000 -0500
|
|
Paul Nasrat |
56db76 |
@@ -150,6 +150,10 @@
|
|
Paul Nasrat |
56db76 |
return if(exists($self->{'provides_check'}->{$params{'-provide'}}));
|
|
Paul Nasrat |
56db76 |
|
|
Paul Nasrat |
56db76 |
#
|
|
Paul Nasrat |
56db76 |
+ # Skip some common false positives
|
|
Paul Nasrat |
56db76 |
+ return if $params{'-provide'} eq 'main';
|
|
Paul Nasrat |
56db76 |
+
|
|
Paul Nasrat |
56db76 |
+ #
|
|
Paul Nasrat |
56db76 |
# Created dependency object
|
|
Paul Nasrat |
56db76 |
my $dep = new Dependency "provide", $params{-provide};
|
|
Paul Nasrat |
56db76 |
$dep->filename($params{-filename});
|