From: Zac Medico Date: Thu, 31 May 2007 21:35:02 +0000 (-0000) Subject: Only check ChangeLog if we're dealing with an ebuild (bug #170604) (trunk r6685) X-Git-Tag: v2.1.2.10~27 X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=f7b35dad6c95951afb369eb3a4bbb49a9f5574a8;p=portage.git Only check ChangeLog if we're dealing with an ebuild (bug #170604) (trunk r6685) svn path=/main/branches/2.1.2/; revision=6702 --- diff --git a/bin/emerge b/bin/emerge index 03446c7c8..7023f02a8 100755 --- a/bin/emerge +++ b/bin/emerge @@ -2778,10 +2778,14 @@ class depgraph: sys.stderr.write("".join(msg)) def calc_changelog(self,ebuildpath,current,next): + if ebuildpath == None or not os.path.exists(ebuildpath): + return [] current = '-'.join(portage.catpkgsplit(current)[1:]) - if current.endswith('-r0'): current = current[:-3] + if current.endswith('-r0'): + current = current[:-3] next = '-'.join(portage.catpkgsplit(next)[1:]) - if next.endswith('-r0'): next = next[:-3] + if next.endswith('-r0'): + next = next[:-3] changelogpath = os.path.join(os.path.split(ebuildpath)[0],'ChangeLog') try: changelog = open(changelogpath).read()