prt-auf: respect non-whitespace separators when reading optional dependencies
This commit is contained in:
parent
0a61682b93
commit
750e998c93
@ -307,6 +307,9 @@ sub sync {
|
|||||||
push @drivers, $d;
|
push @drivers, $d;
|
||||||
}
|
}
|
||||||
closedir($drv);
|
closedir($drv);
|
||||||
|
if ($#drivers < 0) {
|
||||||
|
print("No valid ports drivers. Aborting sync.\n"); return;
|
||||||
|
}
|
||||||
if ($#OPT_COLLECTIONS >= 0) { # Update selected collections
|
if ($#OPT_COLLECTIONS >= 0) { # Update selected collections
|
||||||
foreach my $coll (@OPT_COLLECTIONS) {
|
foreach my $coll (@OPT_COLLECTIONS) {
|
||||||
if (! glob("$sup_path/$coll.*")) {
|
if (! glob("$sup_path/$coll.*")) {
|
||||||
@ -482,7 +485,7 @@ sub get_pkgfile_fields {
|
|||||||
}
|
}
|
||||||
|
|
||||||
$Dependencies =~ s/,(| )/ /g;
|
$Dependencies =~ s/,(| )/ /g;
|
||||||
$SoftDeps =~ s/,(| )/ /g;
|
$SoftDeps =~ s/,(| )/ /g; $SoftDeps =~ s/(\051|\050)//g;
|
||||||
if (shift) {
|
if (shift) {
|
||||||
return $Name, $portpath, $Version, $Release, $descrip, $Dependencies,
|
return $Name, $portpath, $Version, $Release, $descrip, $Dependencies,
|
||||||
$url, $SoftDeps, $maintainer, $readme, $preInstall, $postInstall;
|
$url, $SoftDeps, $maintainer, $readme, $preInstall, $postInstall;
|
||||||
@ -760,6 +763,7 @@ sub deporder { # returns a sorted list of packages required.
|
|||||||
print "Dependency cycle found: ";
|
print "Dependency cycle found: ";
|
||||||
foreach (@treewalk) { print "$_ => "; }
|
foreach (@treewalk) { print "$_ => "; }
|
||||||
print "$s\n";
|
print "$s\n";
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
push(@treewalk, $s); $imark{$s}=1;
|
push(@treewalk, $s); $imark{$s}=1;
|
||||||
|
Loading…
Reference in New Issue
Block a user