diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-03-01 23:31:46 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-03-01 23:31:46 +0000 |
| commit | b759b843bf01e80df2d1b36326c5bfd15299d7d5 (patch) | |
| tree | d018de4585c6bb4801dc464bbd8e72211b185443 | |
| parent | f9a963411157611a8486f6e260448c77122b78be (diff) | |
| download | portage-b759b843bf01e80df2d1b36326c5bfd15299d7d5.tar.gz portage-b759b843bf01e80df2d1b36326c5bfd15299d7d5.tar.bz2 portage-b759b843bf01e80df2d1b36326c5bfd15299d7d5.zip | |
Fix the rest of the broken except statement syntax. (trunk r6120:6121)
svn path=/main/branches/2.1.2/; revision=6122
| -rwxr-xr-x | bin/emerge | 4 | ||||
| -rw-r--r-- | pym/cache/fs_template.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/bin/emerge b/bin/emerge index ed4387cb4..53d925c41 100755 --- a/bin/emerge +++ b/bin/emerge @@ -3832,7 +3832,7 @@ def action_sync(settings, trees, mtimedb, myopts, myaction): try: mytimestamp = time.mktime(time.strptime(content[0], "%a, %d %b %Y %H:%M:%S +0000")) - except OverflowError, ValueError: + except (OverflowError, ValueError): pass del content @@ -4241,7 +4241,7 @@ def action_regen(settings, portdb): for y in nodes: try: del auxdb[y] - except KeyError, CacheError: + except (KeyError, CacheError): pass print "done!" diff --git a/pym/cache/fs_template.py b/pym/cache/fs_template.py index b76e98bd3..9741ecbcc 100644 --- a/pym/cache/fs_template.py +++ b/pym/cache/fs_template.py @@ -39,7 +39,7 @@ class FsBased(template.database): if mtime: mtime=long(mtime) os.utime(path, (mtime, mtime)) - except OSError, IOError: + except (OSError, IOError): return False return True |