From 242a84765384452152b13921659f69f60612b9d6 Mon Sep 17 00:00:00 2001 From: Michael Haubenwallner Date: Wed, 3 Jun 2020 10:15:04 +0200 Subject: cygwin/profile.bashrc: preserve pending dir for cygwin rebase During cygwin rebase, moving all files from pending/ dir to merged/ dir also does move the keepdir file, causing the pending/ dir to get empty. Closes: https://bugs.gentoo.org/726800 Signed-off-by: Michael Haubenwallner --- profiles/prefix/windows/cygwin/profile.bashrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'profiles') diff --git a/profiles/prefix/windows/cygwin/profile.bashrc b/profiles/prefix/windows/cygwin/profile.bashrc index 85a7eabccb1f..4b1478682762 100644 --- a/profiles/prefix/windows/cygwin/profile.bashrc +++ b/profiles/prefix/windows/cygwin/profile.bashrc @@ -191,7 +191,7 @@ cygwin-rebase-merge() { [[ ${mode} == 'pending' ]] || exit 0 - find "./${pendingdir}" -maxdepth 1 -type f \ + find "./${pendingdir}" -mindepth 1 -maxdepth 1 -type f -name 'dlls_*' \ -exec mv -f -t "./${mergeddir}/" {} + ) [[ $? == 0 ]] || die "Merging ${mode} files into rebase database failed." -- cgit v1.2.3-65-gdbad