Gentoo Archives: gentoo-commits

From: "Zac Medico (zmedico)" <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] portage r9673 - main/branches/2.1.2/pym
Date: Tue, 01 Apr 2008 21:59:01
Message-Id: E1JgoVP-0007ia-AW@stork.gentoo.org
1 Author: zmedico
2 Date: 2008-04-01 21:58:58 +0000 (Tue, 01 Apr 2008)
3 New Revision: 9673
4
5 Modified:
6 main/branches/2.1.2/pym/portage.py
7 Log:
8 Use pkgcmp() instead of == and best() for correctness in case of implicit
9 -r0. (trunk r9672)
10
11
12 Modified: main/branches/2.1.2/pym/portage.py
13 ===================================================================
14 --- main/branches/2.1.2/pym/portage.py 2008-04-01 21:58:37 UTC (rev 9672)
15 +++ main/branches/2.1.2/pym/portage.py 2008-04-01 21:58:58 UTC (rev 9673)
16 @@ -5426,8 +5426,10 @@
17 for myslot in intersecting_slots:
18 myversion = versions[myslot]
19 o_version = o_versions[myslot]
20 - if myversion != o_version:
21 - if myversion == best([myversion, o_version]):
22 + difference = pkgcmp(catpkgsplit(myversion)[1:],
23 + catpkgsplit(o_version)[1:])
24 + if difference:
25 + if difference > 0:
26 has_upgrade = True
27 else:
28 has_downgrade = True
29
30 --
31 gentoo-commits@l.g.o mailing list