Permalink
Browse files

Merge remote-tracking branch 'upstream/master' into selfupdate-git

  • Loading branch information...
2 parents 21e8e5e + 7c4e314 commit 649aa6e593edae8044e3b67631d2b596d22fd4f4 @danielj7 committed Apr 22, 2012
Showing with 12 additions and 0 deletions.
  1. +4 −0 perlmod/Fink/Bootstrap.pm
  2. +8 −0 perlmod/Fink/Engine.pm
@@ -461,6 +461,8 @@ sub bootstrap1 {
# disable UseBinaryDist during bootstrap
Fink::Config::set_options( { 'use_binary' => -1 });
+ # bootstrap as root
+ Fink::Config::set_options( { 'build_as_nobody' => 0 });
# make sure we have the package descriptions
Fink::Package->require_packages();
@@ -540,6 +542,8 @@ sub bootstrap2 {
"$basepath with package management.");
print "\n";
+ # bootstrap as root
+ Fink::Config::set_options( { 'build_as_nobody' => 0 });
# use normal install routines, but do not use buildlocks
Fink::Config::set_options( { 'no_buildlock' => 1 } );
Fink::Engine::cmd_install(@elist, @addlist);
View
@@ -899,6 +899,14 @@ sub cmd_description {
}
if ($package->is_obsolete()) {
my $depends_field = $package->pkglist_default('Depends','');
+ my $runtimedepends_field = $package->pkglist_default('RuntimeDepends','');
+ if (length $depends_field and length $runtimedepends_field) {
+ # both have values, so join the lists together
+ $depends_field .= ', ' . $runtimedepends_field;
+ } else {
+ # either neither or only one has value, so avoid null-element when joining
+ $depends_field .= $runtimedepends_field;
+ }
$depends_field =~ s/(\A|,)\s*fink-obsolete-packages(\(|\s|,|\Z)/"$1$2" eq ",," && ","/e;
print " .\n";

0 comments on commit 649aa6e

Please sign in to comment.