[PATCH 2/2] Update autoqa and watch-bodhi-requests.py to be python-2.4 friendly so it can run on EPEL5.

Kamil Paral kparal at redhat.com
Wed Sep 8 07:00:02 UTC 2010


----- "James Laska" <jlaska at redhat.com> wrote:

> ---
>  autoqa                                          |    2 +-
>  hooks/post-bodhi-update/watch-bodhi-requests.py |    4 ++--
>  2 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/autoqa b/autoqa
> index e0848ea..e6bd8c9 100755
> --- a/autoqa
> +++ b/autoqa
> @@ -258,7 +258,7 @@ test_vars = {} # dict of test->its test vars
>  for test in tests[:]:
>      try:
>          test_vars[test] = eval_test_vars(test, default_test_vars)
> -    except IOError as e:
> +    except IOError, e:
>          print "Error: Can't evaluate test '%s': %s" % (test, e)
>          tests.remove(test)
>  testlist = [test for test,vars in test_vars.iteritems() if
> vars['execute'] == True]
> diff --git a/hooks/post-bodhi-update/watch-bodhi-requests.py
> b/hooks/post-bodhi-update/watch-bodhi-requests.py
> index 45f168f..597853a 100755
> --- a/hooks/post-bodhi-update/watch-bodhi-requests.py
> +++ b/hooks/post-bodhi-update/watch-bodhi-requests.py
> @@ -197,7 +197,7 @@ when new requests are filed in bodhi')
>          try:
>              new_updates = bodhi_new_requests_since(r, int(lastcheck),
> testing_cachefile,
>                                                      updatecache=(not
> opts.dryrun))
> -        except fedora.client.FedoraServiceError as e:
> +        except fedora.client.FedoraServiceError, e:
>              print "ERROR: %s" % e
>          # Sort the new updates based on their target/request
>          updates = {'testing': [], 'stable': [], 'critpath': []}
> @@ -213,7 +213,7 @@ when new requests are filed in bodhi')
>              new_updates = []
>              new_updates = bodhi_new_stable_requests(r,
> stable_cachefile,
>                                                 updatecache=(not
> opts.dryrun))
> -        except fedora.client.FedoraServiceError as e:
> +        except fedora.client.FedoraServiceError, e:
>              print "ERROR: %s" % e
>          print "%i stable update requests found" % len(new_updates)
>          updates['stable'] += new_updates
> -- 
> 1.7.2.2

I believe I created those as-es :) I didn't suspect it to be incompatible
with older Pythons. Good to know, thanks.


More information about the autoqa-devel mailing list