mirror of
https://git.FreeBSD.org/ports.git
synced 2025-01-13 07:34:50 +00:00
Pull two fixes from CVS:
- Properly check the result of getDbInfo to make sure we don't try to configure the database when we don't have access. - Correct a typo which broken copyBuild for packages. Bump PORTREVISION.
This commit is contained in:
parent
f01897dc44
commit
b4e398675e
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=231183
@ -6,7 +6,7 @@
|
||||
|
||||
PORTNAME= tinderbox
|
||||
PORTVERSION= 3.2
|
||||
PORTREVISION= 1 # 2009-03-25
|
||||
PORTREVISION= 2 # 2009-03-27
|
||||
CATEGORIES= ports-mgmt
|
||||
MASTER_SITES= http://tinderbox.marcuscom.com/ \
|
||||
http://T32.TecNik93.com/FreeBSD/ports/${PORTNAME}/sources/
|
||||
|
22
ports-mgmt/tinderbox-devel/files/patch-lib__tc_command.pl
Normal file
22
ports-mgmt/tinderbox-devel/files/patch-lib__tc_command.pl
Normal file
@ -0,0 +1,22 @@
|
||||
Index: portstools/tinderbox/lib/tc_command.pl
|
||||
diff -u portstools/tinderbox/lib/tc_command.pl:1.150.2.12 portstools/tinderbox/lib/tc_command.pl:1.150.2.13
|
||||
--- ./lib/tc_command.pl:1.150.2.12 Wed Feb 11 03:50:34 2009
|
||||
+++ ./lib/tc_command.pl Fri Mar 27 00:16:27 2009
|
||||
@@ -24,7 +24,7 @@
|
||||
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
# SUCH DAMAGE.
|
||||
#
|
||||
-# $MCom: portstools/tinderbox/lib/tc_command.pl,v 1.150.2.12 2009/02/11 08:50:34 beat Exp $
|
||||
+# $MCom: portstools/tinderbox/lib/tc_command.pl,v 1.150.2.13 2009/03/27 04:16:27 marcus Exp $
|
||||
#
|
||||
|
||||
my $pb;
|
||||
@@ -3090,7 +3090,7 @@
|
||||
}
|
||||
|
||||
$rc =
|
||||
- $ds->updatePortLastBuiltStatus($port, $dest,
|
||||
+ $ds->updatePortLastStatus($port, $dest,
|
||||
$ds->getPortLastBuiltStatus($port, $src));
|
||||
if (!$rc) {
|
||||
warn
|
24
ports-mgmt/tinderbox-devel/files/patch-lib__tc_command.sh
Normal file
24
ports-mgmt/tinderbox-devel/files/patch-lib__tc_command.sh
Normal file
@ -0,0 +1,24 @@
|
||||
Index: portstools/tinderbox/lib/tc_command.sh
|
||||
diff -u portstools/tinderbox/lib/tc_command.sh:1.101.2.14 portstools/tinderbox/lib/tc_command.sh:1.101.2.15
|
||||
--- ./lib/tc_command.sh:1.101.2.14 Sun Feb 15 12:22:28 2009
|
||||
+++ ./lib/tc_command.sh Fri Mar 27 23:52:57 2009
|
||||
@@ -24,7 +24,7 @@
|
||||
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
# SUCH DAMAGE.
|
||||
#
|
||||
-# $MCom: portstools/tinderbox/lib/tc_command.sh,v 1.101.2.14 2009/02/15 17:22:28 marcus Exp $
|
||||
+# $MCom: portstools/tinderbox/lib/tc_command.sh,v 1.101.2.15 2009/03/28 03:52:57 marcus Exp $
|
||||
#
|
||||
|
||||
export _defaultUpdateHost="cvsup12.FreeBSD.org"
|
||||
@@ -247,8 +247,9 @@
|
||||
do_load=0
|
||||
db_driver=$(getDbDriver)
|
||||
dbinfo=$(getDbInfo ${db_driver})
|
||||
+ db_res=$?
|
||||
genschema=$(tinderLoc scripts sql/genschema)
|
||||
- if [ $? = 0 ]; then
|
||||
+ if [ ${db_res} = 0 ]; then
|
||||
db_admin_host_name=${dbinfo%:*}
|
||||
db_admin_host=${db_admin_host_name%:*}
|
||||
db_name=${db_admin_host_name##*:}
|
Loading…
Reference in New Issue
Block a user