Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Sukneet Basuta (fe25e83b32ac7d80a5b5ab6c833bdc77cfe11ffb)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Sukneet Basuta <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Sukneet Basuta (fe25e83b32ac7d80a5b5ab6c833bdc77cfe11ffb)
  • Date: Fri, 19 Mar 2010 04:28:54 -0500

GIT changes to master grimoire by Sukneet Basuta <sukneet AT sourcemage.org>:

utils/rsyslog/HISTORY | 6 ++++--
utils/rsyslog/PREPARE | 8 ++++++++
2 files changed, 12 insertions(+), 2 deletions(-)

New commits:
commit 7be22e7b2a6ac47d0eead28b14d227d515fa2b71
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Sukneet Basuta <sukneet AT sourcemage.org>

rsyslog: added migration of old branch names to new ones
stable => v4stable, v4beta => v4stable, v5beta => v5stable
The old stable was at version 4.4.1, so migration is to v4stable.
v3stable was added because many distros still use v3

diff --git a/utils/rsyslog/HISTORY b/utils/rsyslog/HISTORY
index bb6f340..57850ea 100644
--- a/utils/rsyslog/HISTORY
+++ b/utils/rsyslog/HISTORY
@@ -1,8 +1,10 @@
2010-03-19 Sukneet Basuta <sukneet AT sourcemage.org>
+ * PREPARE: added migration of old RSYSLOG_BRANCH name to new
+ stable => v4stable, v4beta => v4stable, v5beta => v5stable
+
+2010-03-19 Sukneet Basuta <sukneet AT sourcemage.org>
* PREPARE, DETAILS: renamed v4beta to v4stable, v5beta to v5stable,
and stable to v3stable
* DETAILS: updated v3stable to 3.22.1
- updated RSYSLOG_BRANCH="v5stable" to 5.4.0
- changed blabla
updated devel to 5.5.2
updated v5stable to 5.4.0
updated v4stable to 4.6.1
diff --git a/utils/rsyslog/PREPARE b/utils/rsyslog/PREPARE
index f45cac2..9dcd7c6 100755
--- a/utils/rsyslog/PREPARE
+++ b/utils/rsyslog/PREPARE
@@ -1 +1,9 @@
+if [[ -n $RSYSLOG_BRANCH ]]; then
+ if [[ ${RSYSLOG_BRANCH} == "stable" ]]; then
+ RSYSLOG_BRANCH=v4stable
+ fi
+ RSYSLOG_BRANCH=${RSYSLOG_BRANCH/v4beta/v4stable}
+ RSYSLOG_BRANCH=${RSYSLOG_BRANCH/v5beta/v5stable}
+fi
+
config_query_list RSYSLOG_BRANCH "Build which branch of rsyslog?" v3stable
v4stable v5stable devel



  • [SM-Commit] GIT changes to master grimoire by Sukneet Basuta (fe25e83b32ac7d80a5b5ab6c833bdc77cfe11ffb), Sukneet Basuta, 03/19/2010

Archive powered by MHonArc 2.6.24.

Top of Page