Gentoo Archives: gentoo-commits

From: "Zac Medico (zmedico)" <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] portage r10142 - main/branches/2.1.2/bin
Date: Sat, 03 May 2008 21:23:43
Message-Id: E1JsPCn-0003df-2d@stork.gentoo.org
1 Author: zmedico
2 Date: 2008-05-03 21:23:40 +0000 (Sat, 03 May 2008)
3 New Revision: 10142
4
5 Modified:
6 main/branches/2.1.2/bin/emerge
7 Log:
8 Don't clean out old resume lists when in --ask or --pretend mode.
9 (trunk r10141)
10
11
12 Modified: main/branches/2.1.2/bin/emerge
13 ===================================================================
14 --- main/branches/2.1.2/bin/emerge 2008-05-03 21:22:20 UTC (rev 10141)
15 +++ main/branches/2.1.2/bin/emerge 2008-05-03 21:23:40 UTC (rev 10142)
16 @@ -7815,11 +7815,12 @@
17
18 if not success:
19 mydepgraph.display_problems()
20 - # delete the current list and also the backup
21 - # since it's probably stale too.
22 - for k in ("resume", "resume_backup"):
23 - mtimedb.pop(k, None)
24 - mtimedb.commit()
25 + if not (ask or pretend):
26 + # delete the current list and also the backup
27 + # since it's probably stale too.
28 + for k in ("resume", "resume_backup"):
29 + mtimedb.pop(k, None)
30 + mtimedb.commit()
31
32 return 1
33 else:
34
35 --
36 gentoo-commits@l.g.o mailing list