From b037c7be3bd74de3a360b2d575efc9d417015e41 Mon Sep 17 00:00:00 2001 From: Ion-Mihai Tetcu Date: Sun, 16 Nov 2008 21:38:54 +0000 Subject: Update to 3.1.2 with the following fixes and minor changes: * Don't cleanup WRKDIR until after the postPortBuild Hook has run. * Fix resetBuild in a nullfs environment. * Fix a regression in the version path. * Correct a tinderd typo which masked a diagnostic message. * Show last 30 ports per page in "Current and Latest Builds" page. (webui) * When sorting by "Last Build Attempt" in list build page sort descending -- latest built first. (webui) The main contributor and tester of this release was Ion-Mihai Tetcu. (Remove local patches incorporated upstream) --- .../files/extra-patch-webui__core__TinderboxDS.php | 13 ------------- .../files/extra-patch-webui__module__moduleBuildPorts.php | 11 ----------- ports-mgmt/tinderbox-devel/files/patch-lib__tc_command.sh | 14 -------------- 3 files changed, 38 deletions(-) delete mode 100644 ports-mgmt/tinderbox-devel/files/extra-patch-webui__core__TinderboxDS.php delete mode 100644 ports-mgmt/tinderbox-devel/files/extra-patch-webui__module__moduleBuildPorts.php delete mode 100644 ports-mgmt/tinderbox-devel/files/patch-lib__tc_command.sh (limited to 'ports-mgmt/tinderbox-devel/files') diff --git a/ports-mgmt/tinderbox-devel/files/extra-patch-webui__core__TinderboxDS.php b/ports-mgmt/tinderbox-devel/files/extra-patch-webui__core__TinderboxDS.php deleted file mode 100644 index 829a9c7847a5..000000000000 --- a/ports-mgmt/tinderbox-devel/files/extra-patch-webui__core__TinderboxDS.php +++ /dev/null @@ -1,13 +0,0 @@ ---- ./webui/core/TinderboxDS.php.orig 2008-11-12 17:35:47.000000000 +0200 -+++ ./webui/core/TinderboxDS.php 2008-11-12 17:36:48.000000000 +0200 -@@ -378,6 +378,10 @@ - if ($sortby == "") $sortby = "port_directory"; - if ($sortby == "port_directory") $sortbytable = "p"; - if ($sortby == "port_maintainer") $sortbytable = "p"; -+ if ($sortby == "last_built") { -+ $sortbytable = "bp"; -+ $sortby = "last_built desc"; -+ } - $query = "SELECT p.*, - bp.last_built, - bp.last_status, diff --git a/ports-mgmt/tinderbox-devel/files/extra-patch-webui__module__moduleBuildPorts.php b/ports-mgmt/tinderbox-devel/files/extra-patch-webui__module__moduleBuildPorts.php deleted file mode 100644 index b852f64427e9..000000000000 --- a/ports-mgmt/tinderbox-devel/files/extra-patch-webui__module__moduleBuildPorts.php +++ /dev/null @@ -1,11 +0,0 @@ ---- ./webui/module/moduleBuildPorts.php.orig 2008-11-12 17:38:36.000000000 +0200 -+++ ./webui/module/moduleBuildPorts.php 2008-11-12 17:38:01.000000000 +0200 -@@ -168,7 +168,7 @@ - $build_id = false; - } - -- $ports = $this->TinderboxDS->getLatestPorts( $build_id, 20 ); -+ $ports = $this->TinderboxDS->getLatestPorts( $build_id, 30 ); - - if( is_array( $ports ) && count( $ports ) > 0 ) { - $this->template_assign( 'data', $this->modulePorts->get_list_data( $build_name, $ports ) ); diff --git a/ports-mgmt/tinderbox-devel/files/patch-lib__tc_command.sh b/ports-mgmt/tinderbox-devel/files/patch-lib__tc_command.sh deleted file mode 100644 index 429ea0547497..000000000000 --- a/ports-mgmt/tinderbox-devel/files/patch-lib__tc_command.sh +++ /dev/null @@ -1,14 +0,0 @@ ---- ./lib/tc_command.sh.orig 2008-11-12 22:31:40.000000000 +0200 -+++ ./lib/tc_command.sh 2008-11-12 22:32:00.000000000 +0200 -@@ -288,9 +288,9 @@ - #--------------------------------------------------------------------------- - - Upgrade () { -- VERSION="3.0" -+ VERSION="3.1" - TINDERBOX_URL="http://tinderbox.marcuscom.com/" -- DB_MIGRATION_PATH="${VERSION}" -+ DB_MIGRATION_PATH="3.0 ${VERSION}" - - bkup_file="" - -- cgit v1.2.3