Sort and de-dupe myusevars

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1299 d1e1f19c-881f-0410-ab34-b69fee027534

diff --git a/ChangeLog b/ChangeLog
index 62507c6e184d549d3c54f508cad14b50a97d4fe9..0a67815bfde2e669528dc568e30f4e7496f6b701 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Id: $
 
+  13 Feb 2008; Andrew Gaffney <agaffney@gentoo.org>
+  modules/generic_stage_target.py:
+  Sort and de-dupe myusevars
+
   13 Feb 2008; Chris Gianelloni <wolf31o2@gentoo.org>
   targets/stage1/stage1-chroot.sh:
   Modify stage1-chroot.sh to use the actual -d/--debug code already in catalyst.

diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py
index f6c47146f6fa96ec665580c870b892134fbdf60a..e949e47ed55d74d03b11dfc09f7b7670d70defed 100644 (file)
--- a/modules/generic_stage_target.py
+++ b/modules/generic_stage_target.py
@@ -919,6 +919,7 @@ class generic_stage_target(generic_target):
                                myusevars.extend(self.settings["use"])
 
                        if myusevars:
+                               myusevars = sorted(set(myusevars))
                                myf.write('USE="'+string.join(myusevars)+'"\n')
 
                    # Setup the portage overlay