ekeyword: Don't override stable status in get_architectures_status.

svn path=/trunk/gentoolkit-dev/; revision=790

diff --git a/ChangeLog b/ChangeLog
index ad179bec5cdfbd7399d0d8cb5e3378e18b65e0d3..b9b4d8d54884593753b510c6b1a6643ae9dd664b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,7 @@
                Validate user input/arch, bug 326029.
                Add get_architectures_status function to get the architecture status,
                0 = unkown, 1 = dev, 2 = exp, 3 = stable.
+               Don't override stable status in get_architectures_status.
 
 2010-05-17: Christian Ruppert <idl0r@gentoo.org>
        * echangelog: Update copyright in other files too (except binaries and

diff --git a/src/ekeyword/ekeyword b/src/ekeyword/ekeyword
index a485809f5dd137485d4dca54da521c96e1ca1b62..044f151439e055fa811f2d43ed94d16909972ab5 100755 (executable)
--- a/src/ekeyword/ekeyword
+++ b/src/ekeyword/ekeyword
@@ -65,8 +65,8 @@ sub get_architectures_status() {
                my ($arch, undef, $status) = split(/\s/, $line, 3);
 
                if(defined($ARCH{$arch})) {
-                       $ARCH{$arch} = 1 if $status eq "dev";
-                       $ARCH{$arch} = 2 if $status eq "exp";
+                       $ARCH{$arch} = 1 if $status eq "dev" and $ARCH{$arch} < 3; # Don't override stable
+                       $ARCH{$arch} = 2 if $status eq "exp" and $ARCH{$arch} < 3; # Don't override stable
                        $ARCH{$arch} = 3 if $status eq "stable";
                }
        }