Compare commits

...

2 Commits

Author SHA1 Message Date
Ettore Di Giacinto 928d6da693 Refactorize and quote package when getting deps of package 2017-07-30 01:43:17 +02:00
Ettore Di Giacinto 5c927a25c6 Refactorizations 2017-07-30 01:26:11 +02:00
+6 -12
View File
@@ -148,9 +148,8 @@ sub package_deps {
$cache_key = "${package}:${depth}:${atom}"; $cache_key = "${package}:${depth}:${atom}";
if ( !exists $package_dep_cache{$cache_key} ) { if ( !exists $package_dep_cache{$cache_key} ) {
my $local_p = to_abs_atom($package);
my @dependencies = my @dependencies =
qx/equery -C -q g --depth=$depth $local_p/; #depth=0 it's all qx/equery -C -q g --depth=$depth '$package'/; #depth=0 it's all
chomp @dependencies; chomp @dependencies;
# If an unversioned atom is given, equery returns results for all versions in the portage tree # If an unversioned atom is given, equery returns results for all versions in the portage tree
@@ -244,14 +243,9 @@ sub atom { s/-[0-9]{1,}.*$//; }
sub abs_atom { atom; s/^(\<|\>|=)+// } sub abs_atom { atom; s/^(\<|\>|=)+// }
# Same again as a function # Same again as a function
sub to_atom { my $p = shift; $p =~ s/-[0-9]{1,}.*$//; return $p; } sub to_atom { my $p = shift; local $_ = $p; atom; return $_; }
sub to_abs_atom { sub to_abs_atom { my $p = shift; local $_ = $p; abs_atom; return $_; }
my $p = shift;
$p = to_atom($p);
$p =~ s/^(\<|\>|=)+//;
return $p;
}
# Input: Array # Input: Array
# Output: array with unique elements # Output: array with unique elements
@@ -619,12 +613,12 @@ if ( $qualityassurance_checks == 1 ) {
{ {
say ">> Running repoman on $pn"; say ">> Running repoman on $pn";
_system( _system(
"pushd \$(dirname \$(equery which $pn 2>/dev/null)); repoman; popd" "pushd \$(dirname \$(equery which '$pn' 2>/dev/null)); repoman; popd"
); );
$pn =~ s/\:\:.*//g; $pn =~ s/\:\:.*//g;
say ">> Detecting missing dependencies for $pn"; say ">> Detecting missing dependencies for $pn";
_system("dynlink-scanner $pn"); _system("dynlink-scanner '$pn'");
_system("depcheck $pn"); _system("depcheck '$pn'");
} }
} }