merge and update cleanup

diff --git a/doc/zpm-merge.8 b/doc/zpm-merge.8
index 95da8ec7151749fb49a93a495c90a28e792d6fba..afbd993c40b0e83b6525de90be02fb972654fa91 100644 (file)
--- 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
 .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
 .TP
 \-v
 increase the verbosity level by one, may be given multiple times

-.B \-vFSauonO

 .TP
 \-F
 Also copy the file content.
 .TP
 \-F
 Also copy the file content.

diff --git a/zpm-update b/zpm-update
index 0bac954fe6b84dad3cf8530edd88de02b9231de3..5786aa5c0bf70901d2927b7becbff67dccf0cdce 100755 (executable)
--- 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
        # 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
                if [ $? -ne 0 ]; then
                        die "unable to merge $pkgfile"
                fi

diff --git a/zpm.h b/zpm.h
index 5fc450fd9f322b35b6d9fa400b03a637d9590fbd..2858ff45d034e57416d465c34e60ad0fe7e8a2e4 100644 (file)
--- a/zpm.h
+++ b/zpm.h
@@ -41,6 +41,14 @@ struct zpm {
        struct zpm_package *current_package;
 };
 
        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];
 struct zpm_dependency {
        char minpkg[ZPM_PACKAGE_ID_MAX+1];
        char maxpkg[ZPM_PACKAGE_ID_MAX+1];