From: Nathan Wagner <nw@hydaspes.if.org>
Date: Mon, 18 Feb 2019 12:56:30 +0000 (+0000)
Subject: merge and update cleanup
X-Git-Tag: v0.6.0~1
X-Git-Url: https://pd.if.org/git/?p=zpackage;a=commitdiff_plain;h=40d7f10b59743ed088c33c6b129373652ca9a59a

merge and update cleanup
---

diff --git a/doc/zpm-merge.8 b/doc/zpm-merge.8
index 95da8ec..afbd993 100644
--- a/doc/zpm-merge.8
+++ b/doc/zpm-merge.8
@@ -1,4 +1,4 @@
-.TH zpm-merge 8 2019-02-14 "ZPM 0.6"
+.TH zpm-merge 8 2019-02-18 "ZPM 0.6"
 .SH NAME
 zpm-merge \- copy packages from one database to another
 .SH SYNOPSIS
@@ -31,7 +31,6 @@ set the status of the copied packages to \fIstatus\fR
 .TP
 \-v
 increase the verbosity level by one, may be given multiple times
-.B \-vFSauonO
 .TP
 \-F
 Also copy the file content.
diff --git a/zpm-update b/zpm-update
index 0bac954..5786aa5 100755
--- a/zpm-update
+++ b/zpm-update
@@ -292,7 +292,7 @@ for mergepkg in $merge; do
 	# TODO check for symlinks?
 	if [ $pkgfile != $ZPMDB ]; then
 		echo merging $pkgfile $pkgid
-		zpm merge -Fuv -f "$pkgfile" $pkgid
+		zpm merge -Fu -f "$pkgfile" $pkgid
 		if [ $? -ne 0 ]; then
 			die "unable to merge $pkgfile"
 		fi
diff --git a/zpm.h b/zpm.h
index 5fc450f..2858ff4 100644
--- a/zpm.h
+++ b/zpm.h
@@ -41,6 +41,14 @@ struct zpm {
 	struct zpm_package *current_package;
 };
 
+struct zpm_stat {
+	struct stat st;
+	int configuration;
+	char hash[65]; /* length + room for a nul byte */
+	char diskhash[65]; /* hash of actual file on disk */
+	char *target; /* malloced link target */
+};
+
 struct zpm_dependency {
 	char minpkg[ZPM_PACKAGE_ID_MAX+1];
 	char maxpkg[ZPM_PACKAGE_ID_MAX+1];