From 19404659d0d9adfa713a8d119b5a18f4b9a96b0b Mon Sep 17 00:00:00 2001 From: Pirate Praveen Date: Thu, 13 Dec 2018 14:49:54 +0530 Subject: [PATCH] Install new file introduced upstream --- debian/gitlab.install | 1 + debian/upstream-file-count-check.sh | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/debian/gitlab.install b/debian/gitlab.install index 8e2ce7d221..8e1d762f02 100644 --- a/debian/gitlab.install +++ b/debian/gitlab.install @@ -24,6 +24,7 @@ Dangerfile usr/share/gitlab doc usr/share/gitlab docker usr/share/gitlab docker-compose.yml usr/share/gitlab +Dockerfile.assets usr/share/gitlab fixtures usr/share/gitlab Gemfile usr/share/gitlab generator_templates usr/share/gitlab diff --git a/debian/upstream-file-count-check.sh b/debian/upstream-file-count-check.sh index eb944b41eb..08131d69c9 100644 --- a/debian/upstream-file-count-check.sh +++ b/debian/upstream-file-count-check.sh @@ -6,8 +6,9 @@ ignored=32 if ! [ $(echo "$ucount" - "$dcount"|bc) -eq $ignored ]; then echo "Found new files added by upstream and not added to debian/install" echo "Add them to debian/gitlab.install or adjust 'ignored=${ignored}'" - echo "in debian/upstream-file-count-check.sh as required" + echo "in debian/upstream-file-count-check.sh as required and update" + echo "debian/upstream-file-list" ls -1a |grep -vx .git > debian/upstream-file-list.new - diff -y debian/upstream-file-list debian/upstream-file-list.new + diff -u debian/upstream-file-list debian/upstream-file-list.new exit 1 fi