From c64c7386368e4d2418d6db673be93e01383bb6d3 Mon Sep 17 00:00:00 2001
From: Jakub Jelinek <jakub@redhat.com>
Date: Tue, 10 Oct 2017 15:10:28 +0200
Subject: [PATCH] update_version_svn: Ignore the GCC 5 branch.
* update_version_svn: Ignore the GCC 5 branch.
* crontab: Remove entry for the GCC 5 branch.
From-SVN: r253583
---
maintainer-scripts/ChangeLog | 5 +++++
maintainer-scripts/crontab | 1 -
maintainer-scripts/update_version_svn | 2 +-
3 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/maintainer-scripts/ChangeLog b/maintainer-scripts/ChangeLog
index 813d92005a92..1ab536356ab9 100644
--- a/maintainer-scripts/ChangeLog
+++ b/maintainer-scripts/ChangeLog
@@ -1,3 +1,8 @@
+2017-10-10 Jakub Jelinek <jakub@redhat.com>
+
+ * update_version_svn: Ignore the GCC 5 branch.
+ * crontab: Remove entry for the GCC 5 branch.
+
2017-05-23 Matthias Klose <doko@ubuntu.com>
* gcc_release (XZ): Default to xz --best.
diff --git a/maintainer-scripts/crontab b/maintainer-scripts/crontab
index bd252e22f423..7955703420a4 100644
--- a/maintainer-scripts/crontab
+++ b/maintainer-scripts/crontab
@@ -1,7 +1,6 @@
16 0 * * * sh /home/gccadmin/scripts/update_version_svn
50 0 * * * sh /home/gccadmin/scripts/update_web_docs_svn
55 0 * * * sh /home/gccadmin/scripts/update_web_docs_libstdcxx_svn
-32 22 * * 2 sh /home/gccadmin/scripts/gcc_release -s 5:branches/gcc-5-branch -l -d /sourceware/snapshot-tmp/gcc all
32 22 * * 3 sh /home/gccadmin/scripts/gcc_release -s 6:branches/gcc-6-branch -l -d /sourceware/snapshot-tmp/gcc all
32 22 * * 4 sh /home/gccadmin/scripts/gcc_release -s 7:branches/gcc-7-branch -l -d /sourceware/snapshot-tmp/gcc all
32 22 * * 7 sh /home/gccadmin/scripts/gcc_release -s 8:trunk -l -d /sourceware/snapshot-tmp/gcc all
diff --git a/maintainer-scripts/update_version_svn b/maintainer-scripts/update_version_svn
index 7fa2ecb3f67a..e83757ca1f8e 100755
--- a/maintainer-scripts/update_version_svn
+++ b/maintainer-scripts/update_version_svn
@@ -6,7 +6,7 @@
# in the space separated list in $ADD_BRANCHES.
SVNROOT=${SVNROOT:-"file:///svn/gcc"}
-IGNORE_BRANCHES='gcc-(2_95|3_0|3_1|3_2|3_3|3_4|4_0|4_1|4_2|4_3|4_4|4_5|4_6|4_7|4_8|4_9)-branch'
+IGNORE_BRANCHES='gcc-(2_95|3_0|3_1|3_2|3_3|3_4|4_0|4_1|4_2|4_3|4_4|4_5|4_6|4_7|4_8|4_9|5)-branch'
ADD_BRANCHES='HEAD'
# Run this from /tmp.
--
GitLab