From cdfd8a8e91b65632ad21c4911c44c179ab2c9b39 Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Thu, 9 Dec 2010 13:27:17 +0100 Subject: [PATCH] If -nc and -k are used at the same time, use only the latter --- src/ChangeLog | 6 ++++++ src/main.c | 8 ++++++++ 2 files changed, 14 insertions(+) diff --git a/src/ChangeLog b/src/ChangeLog index c2e2220c..994f8957 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2010-12-09 Giuseppe Scrivano + + * main.c (main): If --no-clobber and --convert-links are used at the + same time, use only the latter. + Reported by: Romain Vimont + 2010-12-07 Jessica McKellar (tiny change) * main.c: Make help message clearer. diff --git a/src/main.c b/src/main.c index ce0b58f6..a583bac4 100644 --- a/src/main.c +++ b/src/main.c @@ -1060,6 +1060,14 @@ main (int argc, char **argv) /* All user options have now been processed, so it's now safe to do interoption dependency checks. */ + if (opt.noclobber && opt.convert_links) + { + fprintf (stderr, + _("Both --no-clobber and --convert-links were specified," + "only --convert-links will be used.\n")); + opt.noclobber = false; + } + if (opt.reclevel == 0) opt.reclevel = INFINITE_RECURSION; /* see recur.h for commentary */ -- 2.39.2