| 1 |
commit: 242a84765384452152b13921659f69f60612b9d6 |
| 2 |
Author: Michael Haubenwallner <haubi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Jun 3 08:15:04 2020 +0000 |
| 4 |
Commit: Michael Haubenwallner <haubi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jun 3 13:50:24 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=242a8476 |
| 7 |
|
| 8 |
cygwin/profile.bashrc: preserve pending dir for cygwin rebase |
| 9 |
|
| 10 |
During cygwin rebase, moving all files from pending/ dir to merged/ dir |
| 11 |
also does move the keepdir file, causing the pending/ dir to get empty. |
| 12 |
Closes: https://bugs.gentoo.org/726800 |
| 13 |
|
| 14 |
Signed-off-by: Michael Haubenwallner <haubi <AT> gentoo.org> |
| 15 |
|
| 16 |
profiles/prefix/windows/cygwin/profile.bashrc | 2 +- |
| 17 |
1 file changed, 1 insertion(+), 1 deletion(-) |
| 18 |
|
| 19 |
diff --git a/profiles/prefix/windows/cygwin/profile.bashrc b/profiles/prefix/windows/cygwin/profile.bashrc |
| 20 |
index 85a7eabccb1..4b147868276 100644 |
| 21 |
--- a/profiles/prefix/windows/cygwin/profile.bashrc |
| 22 |
+++ b/profiles/prefix/windows/cygwin/profile.bashrc |
| 23 |
@@ -191,7 +191,7 @@ cygwin-rebase-merge() { |
| 24 |
|
| 25 |
[[ ${mode} == 'pending' ]] || exit 0 |
| 26 |
|
| 27 |
- find "./${pendingdir}" -maxdepth 1 -type f \ |
| 28 |
+ find "./${pendingdir}" -mindepth 1 -maxdepth 1 -type f -name 'dlls_*' \ |
| 29 |
-exec mv -f -t "./${mergeddir}/" {} + |
| 30 |
) |
| 31 |
[[ $? == 0 ]] || die "Merging ${mode} files into rebase database failed." |
Archives