X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=zpm-syncfs.c;h=2e43dbef9299c8599bb400ff10916f3dfbedeb80;hb=4238c6794cfe19c0d8fd62da35eb966f1868f9da;hp=ff80041e6750a5d43097f703c5bb76f3b733f11c;hpb=62e2d81f8e5c1a2284660752524753638ae59766;p=zpackage diff --git a/zpm-syncfs.c b/zpm-syncfs.c index ff80041..2e43dbe 100644 --- a/zpm-syncfs.c +++ b/zpm-syncfs.c @@ -960,13 +960,14 @@ static int install_files(void *f, int ncols, char **vals, char **cols) { if (mdsame && hashsame && (accept || overwrite)) { /* do nothing */ if (conf->dryrun || conf->verbose) { - fprintf(stderr, "accepting existing file: %s\n", nitem.dest); + fprintf(stderr, "accept %s: %s\n", + eisdir ? "directory" : "file", nitem.dest); } return 0; } if (mdsame && hashsame && !(accept || overwrite)) { /* error */ - return seterror(conf, "will not accept or overwrite existing file: %s", nitem.dest); + return seterror(conf, "file exists: %s", nitem.dest); } if (mdsame && !hashsame && overwrite) { /* install */