diff options
| author | Zac Medico <zmedico@gentoo.org> | 2006-07-25 03:18:26 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2006-07-25 03:18:26 +0000 |
| commit | c1adb11fbb479d6548668509fee0daa6b751bca6 (patch) | |
| tree | 914de0c78422c7f97d0bbb417d1e423e23857d05 /pym | |
| parent | f5ca8d72597d533c9ff55f2f97df1517b381859a (diff) | |
| download | portage-c1adb11fbb479d6548668509fee0daa6b751bca6.tar.gz portage-c1adb11fbb479d6548668509fee0daa6b751bca6.tar.bz2 portage-c1adb11fbb479d6548668509fee0daa6b751bca6.zip | |
Add more dependencies to the digraph in order to help prevent strange merge orders for bug #126748.
svn path=/main/trunk/; revision=4019
Diffstat (limited to 'pym')
| -rw-r--r-- | pym/portage.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/pym/portage.py b/pym/portage.py index c46aea9f9..96791b377 100644 --- a/pym/portage.py +++ b/pym/portage.py @@ -318,6 +318,10 @@ class digraph: self.okeys=[] def addnode(self,mykey,myparent): + if mykey == myparent: + # Refuse to make a node depend on itself so that the caller doesn't + # accidentally create a bogus circular dependency. + myparent = None if not self.dict.has_key(mykey): self.okeys.append(mykey) if myparent is None: |