From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 18 Feb 2010 08:48:13 +0000 (-0000)
Subject: Fix broken diffutils vercmp code.
X-Git-Tag: v2.2_rc63~34
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b354d09d631fed43ff3f8824285d1f66f2f9d05c;p=portage.git

Fix broken diffutils vercmp code.

svn path=/main/trunk/; revision=15368
---

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