diff options
| author | Alec Warner <antarus@gentoo.org> | 2006-03-14 15:46:14 +0000 |
|---|---|---|
| committer | Alec Warner <antarus@gentoo.org> | 2006-03-14 15:46:14 +0000 |
| commit | cf1d6e3132822aa15d724f6b60dabd9a46417e73 (patch) | |
| tree | 85644ccf76cb50738283937268e536b40eb54372 /pym | |
| parent | 220c6466451785913c61293ca255fa9c61c77eb1 (diff) | |
| download | portage-cf1d6e3132822aa15d724f6b60dabd9a46417e73.tar.gz portage-cf1d6e3132822aa15d724f6b60dabd9a46417e73.tar.bz2 portage-cf1d6e3132822aa15d724f6b60dabd9a46417e73.zip | |
Remove some SystemExit exceptions, make portage behave during a ctrl+c
svn path=/main/trunk/; revision=2883
Diffstat (limited to 'pym')
| -rw-r--r-- | pym/portage.py | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/pym/portage.py b/pym/portage.py index fa7be3660..6e9877565 100644 --- a/pym/portage.py +++ b/pym/portage.py @@ -234,10 +234,8 @@ def cacheddir(my_original_path, ignorecvs, ignorelist, EmptyOnError, followSymli if stat.S_ISDIR(pathstat[stat.ST_MODE]): mtime = pathstat[stat.ST_MTIME] else: - raise Exception - except SystemExit, e: - raise - except: + raise portage_exception.PortageException + except (IOError,OSError,portage_exception.PortageException): if EmptyOnError: return [], [] return None, None @@ -262,9 +260,7 @@ def cacheddir(my_original_path, ignorecvs, ignorelist, EmptyOnError, followSymli ftype.append(2) else: ftype.append(3) - except SystemExit, e: - raise - except: + except (IOError, OSError): ftype.append(3) dircache[mypath] = mtime, list, ftype |