From: Wouter Verhelst <w@uter.be>
Date: Tue, 24 Aug 2010 01:11:22 +0000 (+0200)
Subject: Be less scary
X-Git-Url: http://git.alex.org.uk?hp=c21665c3265c06b98224f2fe1f9247a425b283bd

Be less scary

When nothing is configured, a rather scary warning is displayed. Change
it so that it isn't quite as scary, since that produces a number of
questions from users who don't know nbd-server.
---

diff --git a/nbd-server.c b/nbd-server.c
index 2d73079..2e3a673 100644
--- a/nbd-server.c
+++ b/nbd-server.c
@@ -2097,8 +2097,11 @@ int main(int argc, char *argv[]) {
 	}
     
 	if(!servers || !servers->len) {
-		g_warning("Could not parse config file: %s", 
-				err ? err->message : "Unknown error");
+		if(err && !(err->domain == g_quark_from_string("parse_cfile")
+				&& err->code == CFILE_NOTFOUND)) {
+			g_warning("Could not parse config file: %s", 
+					err ? err->message : "Unknown error");
+		}
 	}
 	if(serve) {
 		g_warning("Specifying an export on the command line is deprecated.");
@@ -2106,7 +2109,7 @@ int main(int argc, char *argv[]) {
 	}
 
 	if((!serve) && (!servers||!servers->len)) {
-		g_message("Nothing to do! Bye!");
+		g_message("No configured exports; quitting.");
 		exit(EXIT_FAILURE);
 	}
 	daemonize(serve);