[pkg-bacula-commits] [bacula] 02/35: Remove lenny->squeeze upgrade stuff
Carsten Leonhardt
leo at moszumanska.debian.org
Wed Jul 20 10:21:34 UTC 2016
This is an automated email from the git hooks/post-receive script.
leo pushed a commit to tag development/2011-04-29
in repository bacula.
commit ad66c1875991c56498268ed944bf7966a947f6b0
Author: Jan Hauke Rahm <jhr at debian.org>
Date: Thu Apr 14 12:18:33 2011 +0200
Remove lenny->squeeze upgrade stuff
---
debian/bacula-director-mysql.script.5.0.0 | 63 -------------------------------
debian/rules | 6 ---
2 files changed, 69 deletions(-)
diff --git a/debian/bacula-director-mysql.script.5.0.0 b/debian/bacula-director-mysql.script.5.0.0
deleted file mode 100644
index 306f79f..0000000
--- a/debian/bacula-director-mysql.script.5.0.0
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/bin/sh
-
-# This script exists to remove the JobMedia column in Bacula 5.0.0.
-# It can be removed from the tree after upgrades to 5.0.0 are no longer
-# a concern.
-#
-# More details are at
-# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=569285
-# http://bugs.bacula.org/view.php?id=1498
-#
-# Quoting the latter, with summary by John Goerzen:
-#
-# In Bacula 5.0.0, src/cats/update_mysql_tables.in contains this line:
-#
-# ALTER TABLE JobMedia DROP Stripe ;
-#
-# And indeed, in Bacula 3.0.0, src/cats/make_mysql_tables.in created
-# that column. Trouble is:
-#
-# bacula/updatedb$ grep -i stripe *mysql*
-# update_mysql_tables_8_to_9:ALTER TABLE JobMedia ADD COLUMN Stripe
-# INTEGER UNSIGNED NOT NULL DEFAULT 0;
-# update_mysql_tables_9_to_10.in:ALTER TABLE JobMedia DROP COLUMN
-# Stripe;
-#
-# In other words, users that were running Bacula 1.38, and upgraded to
-# 2.0, would have had the Stripe column removed at that point and never
-# re-created. It seems like somebody added the code to remove the
-# stripe column to 2.0 but forgot to remove it from the
-# make_mysql_tables.in until 5.0.
-
-. /etc/dbconfig-common/bacula-director-mysql.conf
-
-mysqlcmd () {
- MYSQLUSER="--skip-comments" # a no-op for us
- MYSQLPASS="--skip-comments"
- MYSQLSERVER="--skip-comments"
- MYSQLPORT="--skip-comments"
- if [ -n "$dbc_dbuser" ];
- then MYSQLUSER="--user=$dbc_dbuser"
- fi
-
- if [ -n "$dbc_dbpass" ];
- then MYSQLPASS="--password=$dbc_dbpass"
- fi
-
- if [ -n "$dbc_dbserver" ];
- then MYSQLSERVER="--host=$dbc_dbserver"
- fi
-
- if [ -n "$dbc_dbport" ];
- then MYSQLPORT="$MYSQL --port=$dbc_dbport"
- fi
-
- mysql "$MYSQLUSER" "$MYSQLPASS" "$MYSQLSERVER" "$MYSQLPORT" "$dbc_dbname"
-}
-
-if echo "DESCRIBE JobMedia;" | mysqlcmd | grep -q -i Stripe; then
- echo "Found column Stripe in JobMedia; removing."
- echo "ALTER TABLE JobMedia DROP Stripe;" | mysqlcmd
-else
- echo "Did not find column Stripe in JobMedia; not attempting to remove it."
-fi
diff --git a/debian/rules b/debian/rules
index 2ddc13e..69eb1c9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -223,12 +223,6 @@ install-stamp: build-stamp $(foreach v,$(VARIANTS),install-stamp-$(v))
# Remove USE bacula -- dbconfig-common selects the database for us
sed -i -e 's/USE \$${db_name};//' -e 's/USE bacula;//' debian/bacula-director-mysql/$(DBC)/bacula-director-mysql/install/mysql debian/bacula-director-mysql/$(DBC)/bacula-director-mysql/upgrade/mysql/*
-# Next two lines required for upgrade to 5.0.0. Remove that and
-# debian/bacula-director-mysql.script.5.0.0 post-squeeze
- cp debian/bacula-director-mysql.script.5.0.0 \
- debian/bacula-director-mysql/usr/share/dbconfig-common/scripts/bacula-director-mysql/upgrade/mysql/5.0.0
- chmod 0755 debian/bacula-director-mysql/usr/share/dbconfig-common/scripts/bacula-director-mysql/upgrade/mysql/5.0.0
-
# SQLite3
$(call ext-install,sqlite3,debian/tmp-build-sqlite3/src/cats/make_sqlite3_tables)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-bacula/bacula.git
More information about the pkg-bacula-commits
mailing list