diff options
| author |   Michael Haubenwallner <haubi@gentoo.org> | 2020-06-03 10:15:04 +0200 |
|---|---|---|
| committer | Michael Haubenwallner <haubi@gentoo.org> | 2020-06-03 15:50:24 +0200 |
| commit | 242a84765384452152b13921659f69f60612b9d6 (patch) | |
| tree | 8735d609ce515310d0bbac94b5e394f180c11027 /profiles | |
| parent | dev-python/tqdm: Bump to 4.46.1 (diff) | |
| download | gentoo-242a84765384452152b13921659f69f60612b9d6.tar.gz gentoo-242a84765384452152b13921659f69f60612b9d6.tar.bz2 gentoo-242a84765384452152b13921659f69f60612b9d6.zip | |
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 <haubi@gentoo.org>
Diffstat (limited to 'profiles')
| -rw-r--r-- | profiles/prefix/windows/cygwin/profile.bashrc | 2 |
1 files changed, 1 insertions, 1 deletions
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." |