[OSSTEST PATCH 1/2] mg-force-push: unshift . onto @INC

[OSSTEST PATCH 1/2] mg-force-push: unshift . onto @INC

[Ian Jackson]

This script seems to have missed out on the bulk commit fixing this
problem.

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
---
 mg-force-push | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mg-force-push b/mg-force-push
index 4a8f0a2..09c1894 100755
--- a/mg-force-push
+++ b/mg-force-push
@@ -10,6 +10,7 @@
 use strict;
 use warnings;
 
+BEGIN { unshift @INC, qw(.); }
 use Osstest;
 
 my @dryrun;
-- 
2.1.4


_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel

[OSSTEST PATCH 2/2] mg-hosts: Call db_readonly_report inside, not outside, db_retry

[Ian Jackson]

Newer postgresql prints:
  WARNING:  SET TRANSACTION can only be used in transaction blocks
and it is right.

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
---
 mg-force-push | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mg-force-push b/mg-force-push
index 09c1894..1066a30 100755
--- a/mg-force-push
+++ b/mg-force-push
@@ -62,8 +62,8 @@ END
     my %revuses;
     printf "checking revisions used in %s...\n", $flight;
 
-    db_readonly_report();
     db_retry($dbh_tests, [], sub {
+        db_readonly_report();
         $flt_q->execute($flight);
         my $flt_row = $flt_q->fetchrow_hashref();
         $flt_row->{blessing} eq 'real' or die "$flt_row->{blessing} ?";
-- 
2.1.4


_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel