[gentoo-commits] repo/proj/prefix:master commit in: scripts/rsync-generation/

[Fabian Groffen]

commit:     711ddc91052b7664f9f620bfa00992c5a15f48a2
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 27 14:03:23 2018 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue Mar 27 14:03:23 2018 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=711ddc91

scripts/rsync-generation/update-rsync-master: touch cat metadata.xml upon package removal

 scripts/rsync-generation/update-rsync-master.sh | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/scripts/rsync-generation/update-rsync-master.sh b/scripts/rsync-generation/update-rsync-master.sh
index 02807d19c9..4eac483b88 100755
--- a/scripts/rsync-generation/update-rsync-master.sh
+++ b/scripts/rsync-generation/update-rsync-master.sh
@@ -79,10 +79,14 @@ apply_git_mtimes() {
 				files+=( $3 )
 				;;
 			[D]*)
+				set -- ${line}
 				# in case a file is removed, ensure Manifest gets
 				# updated by touching a file which should be there
-				[[ $2 == */* ]] && \
-					files+=( ${2%/*}/metadata.xml )
+				if [[ $2 == */*/* ]] ; then
+					[[ -f ${2%/*}/metadata.xml ]] \
+						&& files+=( ${2%/*}/metadata.xml ) \
+						|| files+=( ${2%/*/*}/metadata.xml )
+				fi
 				;;
 		esac
 	done