diff options
| author | Benjamin Nash <benash@umich.edu> | 2005-07-26 12:48:26 -0400 |
|---|---|---|
| committer | Benjamin Nash <benash@umich.edu> | 2005-07-26 12:48:26 -0400 |
| commit | 648c3beb1d4735e423e77f5189c27c28e5b34493 (patch) | |
| tree | a44b8cbcce8457c4d4eb81e0700808394e09ed18 | |
| parent | 6e0ad62fdc8c0518e54366e3bca25e75335f3198 (diff) | |
| parent | 1e2c16c9124ed3f51229daa715a6c00c2b97f73d (diff) | |
| download | gem5-648c3beb1d4735e423e77f5189c27c28e5b34493.tar.xz | |
Merge m5read@m5.eecs.umich.edu:/bk/m5
into zed.eecs.umich.edu:/z/benash/bk/m5
--HG--
extra : convert_revision : 5cfec85dbfc33b942929e6d379275618f2c60c33
| -rw-r--r-- | python/m5/config.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/python/m5/config.py b/python/m5/config.py index 754b18525..a281feccc 100644 --- a/python/m5/config.py +++ b/python/m5/config.py @@ -405,7 +405,7 @@ class SimObject(object): if found_obj != None and child != found_obj: raise AttributeError, \ 'parent.any matched more than one: %s %s' % \ - (obj.path, child.path) + (found_obj.path, child.path) found_obj = child # search param space for pname,pdesc in self._params.iteritems(): |