X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=zpm-syncfs.c;h=f603fa78bca65a9744a709737f6c7dfaa3c93626;hb=f961fc7796670b908f59b09b17284f9caf47f8af;hp=2e43dbef9299c8599bb400ff10916f3dfbedeb80;hpb=4238c6794cfe19c0d8fd62da35eb966f1868f9da;p=zpackage

diff --git a/zpm-syncfs.c b/zpm-syncfs.c
index 2e43dbe..f603fa7 100644
--- a/zpm-syncfs.c
+++ b/zpm-syncfs.c
@@ -47,7 +47,7 @@ struct nitem {
 	time_t mtime;
 	mode_t mode;
 	int ftype;
-	int configuration;
+	int configuration, oldwasconf;
 	struct timespec times[2];
 };
 
@@ -440,6 +440,7 @@ static unsigned int file_compare(struct nitem *n, struct stat *st) {
 static int read_item(struct config *conf, int ncols, char **vals, char **cols,
 		struct nitem *n) {
 	char *val;
+	long lval;
 	struct passwd *pw;
 	struct group *gr;
 	struct nitem zero = { 0 };
@@ -494,7 +495,10 @@ static int read_item(struct config *conf, int ncols, char **vals, char **cols,
 		seterror(conf, "can't determine config status");
 		return 0;
 	}
-	n->configuration = strtoul(val, NULL, 10);
+	lval = strtol(val, NULL, 10);
+
+	n->configuration = ((lval & 1) != 0);
+	n->oldwasconf = ((lval & 2) != 0);
 
 	val = COL("filetype");
 	if (!val || strlen(val) == 0) {
@@ -730,26 +734,37 @@ static int install(struct config *conf, struct nitem *item, unsigned int flags)
 }
 
 /*
- *
+ * figure out what the difference is for a config file, only called
+ * for an update of a configuration file
+ * return -1 on an error
+ * return 1 if the new file should not be installed
+ * return 0 if the new file should be installed
  */
 static int adjust_for_config(struct config *conf, struct nitem *n, unsigned int
 		diffs) {
-#if 0
+
 	if (!n->oldwasconf) {
 		return 0;
 	}
-#endif
+	
 	/* TODO what if old was a directory? */
 	if (!n->configuration) {
 		/* replacing conf with non-conf */
 		/* absorb file, mark todo */
 		char hash[ZPM_HASH_STRLEN+1];
-		if (zpm_import(conf->log, n->dest, 0, hash)) {
-			zpm_note_add(conf->log, n->pkglist, n->dest, hash,
-					"replaced config file with non-config.  zpm-cat %.8s", hash);
+		if (!conf->dryrun) {
+			if (conf->verbose) {
+				fprintf(stderr, "importing old conf file\n");
+			}
+			if (zpm_import(conf->log, n->dest, 0, hash)) {
+				zpm_note_add(conf->log, n->pkglist, n->dest, hash,
+						"replaced config file with non-config.  zpm-cat %.8s", hash);
+			} else {
+				fprintf(stderr, "unable to import existing config file %s\n", n->dest);
+				return -1;
+			}
 		} else {
-			fprintf(stderr, "unable to import existing config file %s\n", n->dest);
-			return 1;
+			fprintf(stderr, "dry-run: would replace config file %s with non-config file\n", n->dest);
 		}
 		return 0;
 	}
@@ -763,6 +778,9 @@ static int adjust_for_config(struct config *conf, struct nitem *n, unsigned int
 		/* both config directories, can only be changing
 		 * metadata, so no adjustment needed
 		 */
+			if (conf->verbose) {
+				fprintf(stderr, "both config dirs, ok to update\n");
+			}
 		return 0;
 	}
 
@@ -771,14 +789,18 @@ static int adjust_for_config(struct config *conf, struct nitem *n, unsigned int
 
 		/* replacing old file with new directory */
 		/* absorb, make note */
-		if (zpm_import(conf->log, n->dest, 0, hash)) {
-			zpm_note_add(conf->log, n->pkglist, n->dest, hash,
-					"replaced config file with config directory.  zpm-cat %.8s", hash);
+		if (!conf->dryrun) {
+			if (zpm_import(conf->log, n->dest, 0, hash)) {
+				zpm_note_add(conf->log, n->pkglist, n->dest, hash,
+						"replaced config file with config directory.  zpm-cat %.8s", hash);
+			} else {
+				fprintf(stderr, "unable to import existing config file %s\n", n->dest);
+				return -1;
+			}
 		} else {
-			fprintf(stderr, "unable to import existing config file %s\n", n->dest);
-			return -1;
+			fprintf(stderr, "dry-run: would replace config file %s with config directory\n", n->dest);
 		}
-		return 0;
+			return 0;
 	}
 
 	if (eisdir) {
@@ -793,11 +815,17 @@ static int adjust_for_config(struct config *conf, struct nitem *n, unsigned int
 	/* replacing old file with new file */
 	/* new is same as on disk */
 	if (!(diffs & D_HASH)) {
+			if (conf->verbose) {
+				fprintf(stderr, "new config file is already on disk, probably shouldn't happen\n");
+			}
 		return 0;
 	}
 
 	/* new is different than on disk, but on disk is same as old */
 	if (!(diffs & D_OHASH)) {
+			if (conf->verbose) {
+				fprintf(stderr, "old config file not changed from default, replacing with new default\n");
+			}
 		/* ok to do the update, since same as default */
 		fprintf(stderr, "updating default config %s\n", n->dest);
 		return 0;
@@ -805,9 +833,17 @@ static int adjust_for_config(struct config *conf, struct nitem *n, unsigned int
 
 	/* new is different than on disk, and disk different than old */
 	/* log */
-	zpm_note_add(conf->log, n->pkglist, n->dest, n->hash,
-			"default config file update.  zpm-cat %.8s", n->hash);
-	/* TODO check for note error */
+	if (conf->verbose) {
+		fprintf(stderr, "new default config file is different than on disk, and old default was changed, should keep on-disk config\n");
+	}
+	if (!conf->dryrun) {
+		zpm_note_add(conf->log, n->pkglist, n->dest, n->hash,
+				"default config file update.  zpm-cat %.8s", n->hash);
+		/* TODO check for note error */
+	} else {
+		fprintf(stderr, "dry-run: default config file %s update\n",
+				n->dest);
+	}
 	return 1;
 
 }
@@ -965,14 +1001,26 @@ static int install_files(void *f, int ncols, char **vals, char **cols) {
 				}
 				return 0;
 			}
+
 			if (mdsame && hashsame && !(accept || overwrite)) {
 				/* error */
 				return seterror(conf, "file exists: %s", nitem.dest);
 			}
+
 			if (mdsame && !hashsame && overwrite) {
 				/* install */
 				return install(conf, &nitem, eisdir ? 11 : 7);
 			}
+
+			if (nitem.configuration && accept) {
+				/* accept a changed config file */
+				if (conf->dryrun || conf->verbose) {
+					fprintf(stderr, "accept %smodified config %s: %s\n", (!mdsame || !hashsame) ? "" : "un", 
+							eisdir ? "directory" : "file", nitem.dest);
+				}
+				return 0;
+			}
+
 			if (mdsame && !hashsame && !overwrite) {
 				/* accept doesn't matter, since it's
 				 * not an acceptable file */