aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoridl0r <idl0r@gentoo.org>2010-07-02 16:25:56 +0000
committeridl0r <idl0r@gentoo.org>2010-07-02 16:25:56 +0000
commita0f92a9b70cc8ed892482a0f1eaebf7e9f8abec6 (patch)
treec6c6aa7840670934877df1858df6fd06341fb4b4
parentekeyword: Add get_architectures_status function to get the architecture status, (diff)
downloadgentoolkit-a0f92a9b70cc8ed892482a0f1eaebf7e9f8abec6.tar.gz
gentoolkit-a0f92a9b70cc8ed892482a0f1eaebf7e9f8abec6.tar.bz2
gentoolkit-a0f92a9b70cc8ed892482a0f1eaebf7e9f8abec6.zip
ekeyword: Don't override stable status in get_architectures_status.
svn path=/trunk/gentoolkit-dev/; revision=790
-rw-r--r--ChangeLog1
-rwxr-xr-xsrc/ekeyword/ekeyword4
2 files changed, 3 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index ad179be..b9b4d8d 100644
--- 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 a485809..044f151 100755
--- 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";
}
}