From: Robert Spalek <robert@ucw.cz>
Date: Thu, 27 Apr 2006 16:33:09 +0000 (+0200)
Subject: conf2: postponing of commits fixed
X-Git-Tag: holmes-import~645^2~11^2~16
X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=d5c5f0f5fbf3ae1fbb464b695c7596a730aaec4f;p=libucw.git

conf2: postponing of commits fixed
---

diff --git a/lib/conf2.c b/lib/conf2.c
index 04c20992..72a47929 100644
--- a/lib/conf2.c
+++ b/lib/conf2.c
@@ -1412,14 +1412,15 @@ cf_get_opt(int argc, char * const argv[], const char *short_opts, const struct o
     int res = getopt_long (argc, argv, short_opts, long_opts, long_index);
     if (res == 'S' || res == 'C' || res == 0x64436667)
     {
-      postpone_commit = 1;
       if (other_options)
 	die("The -S and -C options must precede all other arguments");
       if (res == 'S') {
+	postpone_commit = 1;
 	load_default();
 	if (cf_set(optarg))
 	  die("Cannot set %s", optarg);
       } else if (res == 'C') {
+	postpone_commit = 1;
 	if (cf_load(optarg))
 	  die("Cannot load config file %s", optarg);
       }