From: Zac Medico <zmedico@gentoo.org>
Date: Tue, 2 Mar 2010 20:26:56 +0000 (-0000)
Subject: Fix broken diffutils vercmp code. (trunk r15368)
X-Git-Tag: v2.1.8~127
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a37e2f5970f98e6cedd75a85f4b19803428189d3;p=portage.git

Fix broken diffutils vercmp code. (trunk r15368)

svn path=/main/branches/2.1.7/; revision=15595
---

diff --git a/bin/dispatch-conf b/bin/dispatch-conf
index 776ce5dd8..2a6462ac4 100755
--- a/bin/dispatch-conf
+++ b/bin/dispatch-conf
@@ -125,9 +125,8 @@ class dispatch:
             diffutils = vardb.match('sys-apps/diffutils')
             if diffutils:
                 diffutils = diffutils[0]
-                diffutils_split = portage.catpkgsplit(diffutils)[1:]
-                if portage.vercmp(diffutils_split,
-                    portage.pkgsplit('diffutils-2.9')) >= 0:
+                diffutils_ver = '-'.join(portage.catpkgsplit(diffutils)[2:])
+                if portage.vercmp(diffutils_ver, '2.9') >= 0:
                     diffutils_2_9 = True
 
         # config file freezing support