Gentoo Archives: gentoo-commits

From: "Zac Medico (zmedico)" <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] portage r13444 - main/branches/2.1.6/bin
Date: Thu, 30 Apr 2009 06:53:41
Message-Id: E1LzQ9K-00051A-QF@stork.gentoo.org
1 Author: zmedico
2 Date: 2009-04-30 06:53:38 +0000 (Thu, 30 Apr 2009)
3 New Revision: 13444
4
5 Modified:
6 main/branches/2.1.6/bin/egencache
7 Log:
8 Automatically enable FEATURES=metadata-transfer if it's not enabled,
9 instead of bailing out. (trunk r13265)
10
11 Modified: main/branches/2.1.6/bin/egencache
12 ===================================================================
13 --- main/branches/2.1.6/bin/egencache 2009-04-30 06:53:25 UTC (rev 13443)
14 +++ main/branches/2.1.6/bin/egencache 2009-04-30 06:53:38 UTC (rev 13444)
15 @@ -243,11 +243,15 @@
16 target_root='/', env=env)
17
18 if 'metadata-transfer' not in settings.features:
19 - writemsg_level("ecachegen: error: " + \
20 - "FEATURES=metadata-transfer is not enabled\n",
21 - level=logging.ERROR, noiselevel=-1)
22 - return 1
23 + writemsg_level("ecachegen: warning: " + \
24 + "automatically enabling FEATURES=metadata-transfer\n",
25 + level=logging.WARNING, noiselevel=-1)
26 + settings.features.add('metadata-transfer')
27 + settings['FEATURES'] = ' '.join(sorted(settings.features))
28 + settings.backup_changes('FEATURES')
29
30 + settings.lock()
31 +
32 portdb = portage.portdbapi(settings["PORTDIR"], mysettings=settings)
33
34 cp_iter = None