Gentoo Archives: gentoo-commits

From: "Zac Medico (zmedico)" <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] portage r10002 - main/branches/2.1.2/bin
Date: Sun, 27 Apr 2008 19:56:54
Message-Id: E1JqCzU-00067H-0c@stork.gentoo.org
1 Author: zmedico
2 Date: 2008-04-27 19:56:50 +0000 (Sun, 27 Apr 2008)
3 New Revision: 10002
4
5 Modified:
6 main/branches/2.1.2/bin/emerge
7 Log:
8 Bug #219369 - Enable automatic upgrage or downgrade to a version
9 with visible KEYWORDS when the installed version is masked by
10 KEYWORDS, but never reinstall the same exact version only due to
11 a KEYWORDS mask. (trunk r10001)
12
13
14 Modified: main/branches/2.1.2/bin/emerge
15 ===================================================================
16 --- main/branches/2.1.2/bin/emerge 2008-04-27 19:52:09 UTC (rev 10001)
17 +++ main/branches/2.1.2/bin/emerge 2008-04-27 19:56:50 UTC (rev 10002)
18 @@ -2942,6 +2942,26 @@
19 continue
20 except portage_exception.InvalidDependString:
21 continue
22 +
23 + # Enable upgrage or downgrade to a version
24 + # with visible KEYWORDS when the installed
25 + # version is masked by KEYWORDS, but never
26 + # reinstall the same exact version only due
27 + # to a KEYWORDS mask.
28 + if installed and matched_packages and \
29 + pkgsettings._getMissingKeywords(
30 + pkg.cpv, pkg.metadata):
31 + different_version = None
32 + for avail_pkg in matched_packages:
33 + if not portage_dep.cpvequal(
34 + pkg.cpv, avail_pkg.cpv):
35 + different_version = avail_pkg
36 + break
37 + if different_version is not None:
38 + # Only reinstall for KEYWORDS if
39 + # it's not the same version.
40 + continue
41 +
42 if not built and not calculated_use:
43 # This is avoided whenever possible because
44 # it's expensive.
45
46 --
47 gentoo-commits@l.g.o mailing list