Added '#!no_value!#' to be handled properly by Convert->format_mmddyy_to_yymmdd.

Added pciutils to the list of anvil-core requirements.

Signed-off-by: Digimer <digimer@alteeve.ca>
main
Digimer 3 years ago
parent 7401c7f879
commit 6229a0f6b6
  1. 4
      Anvil/Tools/Convert.pm
  2. 10
      Anvil/Tools/Database.pm
  3. 1
      anvil.spec.in

@ -848,8 +848,8 @@ sub format_mmddyy_to_yymmdd
date => $date, date => $date,
}}); }});
# Sometimes we're passed '--' which is not strictly an error, so we'll return it back. # Sometimes we're passed '--' or '#!no_value!#' which is not strictly an error, so we'll return it back.
if ($date eq "--") if (($date eq "--") or ($date eq "#!no_value!#"))
{ {
return($date); return($date);
} }

@ -952,7 +952,7 @@ sub configure_pgsql
} }
# Start or restart the daemon? # Start or restart the daemon?
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 1, list => { $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => {
's1:running' => $running, 's1:running' => $running,
's2:update_postgresql_file' => $update_postgresql_file, 's2:update_postgresql_file' => $update_postgresql_file,
's3:update_pg_hba_file' => $update_pg_hba_file, 's3:update_pg_hba_file' => $update_pg_hba_file,
@ -960,12 +960,12 @@ sub configure_pgsql
if (not $running) if (not $running)
{ {
# Did we initialize? # Did we initialize?
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 1, list => { initialized => $initialized }}); $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => { initialized => $initialized }});
if ($initialized) if ($initialized)
{ {
# Start the daemon. # Start the daemon.
my $return_code = $anvil->System->start_daemon({daemon => $anvil->data->{sys}{daemon}{postgresql}}); my $return_code = $anvil->System->start_daemon({daemon => $anvil->data->{sys}{daemon}{postgresql}});
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 1, list => { return_code => $return_code }}); $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => { return_code => $return_code }});
if ($return_code eq "0") if ($return_code eq "0")
{ {
# Started the daemon. # Started the daemon.
@ -983,7 +983,7 @@ sub configure_pgsql
{ {
# Reload # Reload
my $return_code = $anvil->System->start_daemon({daemon => $anvil->data->{sys}{daemon}{postgresql}}); my $return_code = $anvil->System->start_daemon({daemon => $anvil->data->{sys}{daemon}{postgresql}});
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 1, list => { return_code => $return_code }}); $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => { return_code => $return_code }});
if ($return_code eq "0") if ($return_code eq "0")
{ {
# Reloaded the daemon. # Reloaded the daemon.
@ -997,7 +997,7 @@ sub configure_pgsql
} }
# Do user and DB checks only if we're made a change above. # Do user and DB checks only if we're made a change above.
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 1, list => { $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => {
's1:initialized' => $initialized, 's1:initialized' => $initialized,
's2:update_postgresql_file' => $update_postgresql_file, 's2:update_postgresql_file' => $update_postgresql_file,
's3:update_pg_hba_file' => $update_pg_hba_file, 's3:update_pg_hba_file' => $update_pg_hba_file,

@ -63,6 +63,7 @@ Requires: mailx
Requires: mlocate Requires: mlocate
Requires: net-snmp-utils Requires: net-snmp-utils
Requires: nvme-cli Requires: nvme-cli
Requires: pciutils
Requires: perl-Capture-Tiny Requires: perl-Capture-Tiny
Requires: perl-Data-Dumper Requires: perl-Data-Dumper
Requires: perl-Data-Validate-Domain Requires: perl-Data-Validate-Domain

Loading…
Cancel
Save