From 64f0d8c7c356e359c92ef21d99a42c5022d27c3d Mon Sep 17 00:00:00 2001 From: Axel Beckert Date: Sun, 16 Sep 2012 20:11:32 +0200 Subject: [PATCH] Patch to provide better diagnostics when renaming directories Based on patch by Ulrich Eckhardt . Closes: #584850 --- debian/changelog | 2 ++ ...er-diagnostics-for-directories-584850.diff | 22 +++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 25 insertions(+) create mode 100644 debian/patches/better-diagnostics-for-directories-584850.diff diff --git a/debian/changelog b/debian/changelog index c4461dd..a985e54 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,8 @@ mmv (1.01b-16) UNRELEASED; urgency=low * Bump Standards-Version to 3.9.3 (no other changes necessary) * Switch to source format "3.0 (quilt)" * Add patch to fix FTBFS with -Werror=format-security + * Add slightly modified patch by Ulrich Eckhardt to provide better + diagnostics for directory renaming (Closes: #584850) * Rewrite debian/rules with oldstyle debhelper utilities + Use compat-level 9 + Add build-dependency on debhelper >= 9~ diff --git a/debian/patches/better-diagnostics-for-directories-584850.diff b/debian/patches/better-diagnostics-for-directories-584850.diff new file mode 100644 index 0000000..57044a7 --- /dev/null +++ b/debian/patches/better-diagnostics-for-directories-584850.diff @@ -0,0 +1,22 @@ +Description: Provide better diagnostic for directories + Provides better diagnostic when renaming directories. Based on patch + by Ulrich Eckhardt . +Debian-Bug: 584850 +Author: Axel Beckert + +Index: mmv/mmv.c +=================================================================== +--- mmv.orig/mmv.c 2012-09-16 20:03:04.269626454 +0200 ++++ mmv/mmv.c 2012-09-16 20:06:18.220733497 +0200 +@@ -1215,7 +1215,11 @@ + getstat(pathbuf, ffrom); + if ((ffrom->fi_stflags & FI_ISDIR) ? !dirs : !fils) + #endif ++ { ++ if (verbose) ++ printf("ignoring directory %s\n", ffrom->fi_name); + return(0); ++ } + + if (needslash) { + strcpy(pathend + *pk, SLASHSTR); diff --git a/debian/patches/series b/debian/patches/series index 9111cc7..7f633ff 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ patches-as-of-mmv-1.01b-15.diff format-security.diff +better-diagnostics-for-directories-584850.diff -- 2.39.2