Browse Source

Now things are working perfectly. Had to add a last statement to the while

wrapper for expect_uml, this is a new bug.  And added preserve-permissions.
master
freesource 22 years ago
parent
commit
578ddd6dd2
  1. 13
      BootRoot/BootRoot.pm
  2. 4
      BootRoot/Yard.pm

13
BootRoot/BootRoot.pm

@ -855,8 +855,19 @@ if ( $option{"uml-exclusively"} ) {
: ($uml_exclusively = 0); : ($uml_exclusively = 0);
} }
my $preserve_ownership = 0; # assume no
if ( $option{"preserve-ownership"} ) {
$option{"preserve-ownership"} eq "y"
? ($preserve_ownership = 1)
: ($preserve_ownership = 0);
}
$ars->{uml_exclusively} = $uml_exclusively; $ars->{uml_exclusively} = $uml_exclusively;
ars2($ars); #not used in function below ars2($ars); #not used in function below
$ars->{preserve_ownership} = $uml_exclusively;
ars2($ars);
# links_deps() # links_deps()
# Good defaults # Good defaults
@ -918,7 +929,7 @@ if ( $method eq "yard" ) {
###################################################### ######################################################
} # end if $::commandline } # end if !$::commandline
} # end start } # end start

4
BootRoot/Yard.pm

@ -1542,6 +1542,10 @@ sub create_expect_uml {
while (<EXPECT>) { while (<EXPECT>) {
info(1,"$x_count $_"); info(1,"$x_count $_");
$x_count++; $x_count++;
# Didn't need this before, but now do.
if ( $_ =~/nbd.*module cleaned up/ ) {
last;
}
while (Gtk->events_pending) { Gtk->main_iteration; } while (Gtk->events_pending) { Gtk->main_iteration; }
} }

Loading…
Cancel
Save