Merge pull request #211 from ClusterLabs/anvil-tools-dev

Added '#!no_value!#' to be handled properly by Convert->format_mmddyy…

Anvil/Tools/Convert.pm

@@ -848,8 +848,8 @@ sub format_mmddyy_to_yymmdd
 		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);
 	}

Anvil/Tools/Database.pm

@@ -952,7 +952,7 @@ sub configure_pgsql
 	}
 	
 	# 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,
 		's2:update_postgresql_file' => $update_postgresql_file, 
 		's3:update_pg_hba_file'     => $update_pg_hba_file, 
@@ -960,12 +960,12 @@ sub configure_pgsql
 	if (not $running)
 	{
 		# 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)
 		{
 			# Start the daemon.
 			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")
 			{
 				# Started the daemon.
@@ -983,7 +983,7 @@ sub configure_pgsql
 	{
 		# Reload
 		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")
 		{
 			# Reloaded the daemon.
@@ -997,7 +997,7 @@ sub configure_pgsql
 	}
 	
 	# 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,
 		's2:update_postgresql_file' => $update_postgresql_file, 
 		's3:update_pg_hba_file'     => $update_pg_hba_file, 

anvil.spec.in

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