Changeset 194
- Timestamp:
- 02/08/05 20:16:21 (4 years ago)
- Files:
-
- manage/trunk/manage (modified) (6 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
manage/trunk/manage
r193 r194 158 158 } 159 159 160 sub get_password($) {160 sub read_password($) { 161 161 my $prompt = shift; 162 162 my $tty = ctermid(); … … 172 172 close(TTY); 173 173 return $secret; 174 } 175 176 sub get_password($) { 177 warning("get_password() is deprecated and will be removed, use read_password()"); 178 return read_password(@_); 174 179 } 175 180 … … 280 285 $_ =~ /^([.\w-]+)\s*=\s*(.*)/; 281 286 if (defined($CONF{$1})) { 282 ${$CONF{$1}->{value}} = $2; 287 if ($CONF{$1}->{on_change}) { 288 ${$CONF{$1}->{value}} = $CONF{$1}->{on_change}->(${$CONF{$1}->{value}}, $2); 289 } else { 290 ${$CONF{$1}->{value}} = $2; 291 } 292 $CONF{$1}->{loaded} = 1; 283 293 } 284 294 } … … 310 320 $pattern = '.+' unless defined($pattern); 311 321 if ($value =~ /^$pattern$/) { 312 ${$CONF{$key}->{value}} = $value; 322 if ($CONF{$key}->{on_change}) { 323 ${$CONF{$key}->{value}} = $CONF{$key}->{on_change}->(${$CONF{$key}->{value}}, $value); 324 } else { 325 ${$CONF{$key}->{value}} = $value; 326 } 313 327 } else { 314 328 error("Value for '$key' is invalid."); … … 411 425 412 426 Binary symlink: 413 $Config{bin}/$ SELF -> $Config{bin}/$cli427 $Config{bin}/$cli -> $Config{bin}/$SELF 414 428 Modules: 415 429 EOF … … 509 523 510 524 for my $key (keys %CONF) { 525 # We only trigger an on_change if this did not already occur in load_config() 526 ${$CONF{$key}->{value}} = $CONF{$key}->{on_change}->(${$CONF{$key}->{value}}, ${$CONF{$key}->{value}}) 527 if $CONF{$key}->{on_change} and not $CONF{$key}->{loaded}; 511 528 $ORIGINAL_CONF{$key} = ${$CONF{$key}->{value}}; 512 529 }
