* [gentoo-commits] gentoo-x86 commit in app-backup/bacula: ChangeLog bacula-5.2.9.ebuild bacula-5.2.5.ebuild bacula-5.2.6.ebuild
@ 2012-08-07 18:09 Thomas Beierlein (tomjbe)
0 siblings, 0 replies; only message in thread
From: Thomas Beierlein (tomjbe) @ 2012-08-07 18:09 UTC (permalink / raw
To: gentoo-commits
tomjbe 12/08/07 18:09:06
Modified: ChangeLog bacula-5.2.9.ebuild bacula-5.2.5.ebuild
Removed: bacula-5.2.6.ebuild
Log:
Fix generation of init script (Bug 426374). Thanks Koreth. Drop old
(Portage version: 2.1.11.9/cvs/Linux x86_64)
Revision Changes Path
1.129 app-backup/bacula/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/bacula/ChangeLog?rev=1.129&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/bacula/ChangeLog?rev=1.129&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/bacula/ChangeLog?r1=1.128&r2=1.129
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-backup/bacula/ChangeLog,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -r1.128 -r1.129
--- ChangeLog 24 Jun 2012 18:28:00 -0000 1.128
+++ ChangeLog 7 Aug 2012 18:09:06 -0000 1.129
@@ -1,6 +1,10 @@
# ChangeLog for app-backup/bacula
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/ChangeLog,v 1.128 2012/06/24 18:28:00 tomjbe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/ChangeLog,v 1.129 2012/08/07 18:09:06 tomjbe Exp $
+
+ 07 Aug 2012; Thomas Beierlein <tomjbe@gentoo.org> bacula-5.2.5.ebuild,
+ -bacula-5.2.6.ebuild, bacula-5.2.9.ebuild:
+ Fix generation of init script (Bug 426374). Thanks Koreth. Drop old
*bacula-5.2.9 (24 Jun 2012)
1.2 app-backup/bacula/bacula-5.2.9.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/bacula/bacula-5.2.9.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/bacula/bacula-5.2.9.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/bacula/bacula-5.2.9.ebuild?r1=1.1&r2=1.2
Index: bacula-5.2.9.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-backup/bacula/bacula-5.2.9.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bacula-5.2.9.ebuild 24 Jun 2012 18:28:00 -0000 1.1
+++ bacula-5.2.9.ebuild 7 Aug 2012 18:09:06 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/bacula-5.2.9.ebuild,v 1.1 2012/06/24 18:28:00 tomjbe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/bacula-5.2.9.ebuild,v 1.2 2012/08/07 18:09:06 tomjbe Exp $
EAPI="4"
PYTHON_DEPEND="python? 2"
@@ -286,6 +286,17 @@
newins scripts/filetype.vim bacula_ft.vim
fi
+ # set the value of $mydbtype depending on which database we
+ # specified in the use flags.
+ if use sqlite3; then
+ mydbtype="sqlite3"
+ fi
+ if use postgres; then
+ mydbtype="postgres"
+ fi
+ if use mysql; then
+ mydbtype="mysql"
+ fi
# setup init scripts
myscripts="bacula-fd"
if ! use bacula-clientonly; then
@@ -301,7 +312,8 @@
# so we can modify them as needed
cp "${FILESDIR}/${script}".confd "${T}/${script}".confd || die "failed to copy ${script}.confd"
cp "${FILESDIR}/${script}".initd "${T}/${script}".initd || die "failed to copy ${script}.initd"
- # set database dependancy for the director init script
+
+ # now set the database dependancy for the director init script
case "${script}" in
bacula-dir)
case "${mydbtype}" in
@@ -318,6 +330,7 @@
*)
;;
esac
+
# install init script and config
newinitd "${T}/${script}".initd "${script}"
newconfd "${T}/${script}".confd "${script}"
1.8 app-backup/bacula/bacula-5.2.5.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/bacula/bacula-5.2.5.ebuild?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/bacula/bacula-5.2.5.ebuild?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/bacula/bacula-5.2.5.ebuild?r1=1.7&r2=1.8
Index: bacula-5.2.5.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-backup/bacula/bacula-5.2.5.ebuild,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- bacula-5.2.5.ebuild 24 May 2012 04:36:18 -0000 1.7
+++ bacula-5.2.5.ebuild 7 Aug 2012 18:09:06 -0000 1.8
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/bacula-5.2.5.ebuild,v 1.7 2012/05/24 04:36:18 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/bacula-5.2.5.ebuild,v 1.8 2012/08/07 18:09:06 tomjbe Exp $
EAPI="4"
PYTHON_DEPEND="python? 2"
@@ -287,6 +287,17 @@
newins scripts/filetype.vim bacula_ft.vim
fi
+ # set the value of $mydbtype depending on which database we
+ # specified in the use flags.
+ if use sqlite3; then
+ mydbtype="sqlite3"
+ fi
+ if use postgres; then
+ mydbtype="postgres"
+ fi
+ if use mysql; then
+ mydbtype="mysql"
+ fi
# setup init scripts
myscripts="bacula-fd"
if ! use bacula-clientonly; then
@@ -302,7 +313,8 @@
# so we can modify them as needed
cp "${FILESDIR}/${script}".confd "${T}/${script}".confd || die "failed to copy ${script}.confd"
cp "${FILESDIR}/${script}".initd "${T}/${script}".initd || die "failed to copy ${script}.initd"
- # set database dependancy for the director init script
+
+ # now set the database dependancy for the director init script
case "${script}" in
bacula-dir)
case "${mydbtype}" in
@@ -319,6 +331,7 @@
*)
;;
esac
+
# install init script and config
newinitd "${T}/${script}".initd "${script}"
newconfd "${T}/${script}".confd "${script}"
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2012-08-07 18:09 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-08-07 18:09 [gentoo-commits] gentoo-x86 commit in app-backup/bacula: ChangeLog bacula-5.2.9.ebuild bacula-5.2.5.ebuild bacula-5.2.6.ebuild Thomas Beierlein (tomjbe)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox