Gentoo Archives: gentoo-commits

From: Arfrever Frehtes Taifersar Arahesis <arfrever@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/package/ebuild/
Date: Mon, 29 Aug 2011 18:04:36
Message-Id: abfaa01acee62306b234efd56e8ddf5b0fd583f9.arfrever@gentoo
1 commit: abfaa01acee62306b234efd56e8ddf5b0fd583f9
2 Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Gentoo <DOT> Org>
3 AuthorDate: Mon Aug 29 18:03:29 2011 +0000
4 Commit: Arfrever Frehtes Taifersar Arahesis <arfrever <AT> gentoo <DOT> org>
5 CommitDate: Mon Aug 29 18:03:29 2011 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=abfaa01a
7
8 Mark some messages for translation.
9
10 ---
11 pym/portage/package/ebuild/doebuild.py | 20 ++++++++++----------
12 1 files changed, 10 insertions(+), 10 deletions(-)
13
14 diff --git a/pym/portage/package/ebuild/doebuild.py b/pym/portage/package/ebuild/doebuild.py
15 index 0e80917..92d73e5 100644
16 --- a/pym/portage/package/ebuild/doebuild.py
17 +++ b/pym/portage/package/ebuild/doebuild.py
18 @@ -693,8 +693,8 @@ def doebuild(myebuild, mydo, myroot, mysettings, debug=0, listonly=0,
19 newstuff = False
20 if not os.path.exists(os.path.join(
21 mysettings["PORTAGE_BUILDDIR"], ".unpacked")):
22 - writemsg_stdout(
23 - ">>> Not marked as unpacked; recreating WORKDIR...\n")
24 + writemsg_stdout(_(
25 + ">>> Not marked as unpacked; recreating WORKDIR...\n"))
26 newstuff = True
27 else:
28 for x in alist:
29 @@ -707,8 +707,8 @@ def doebuild(myebuild, mydo, myroot, mysettings, debug=0, listonly=0,
30 x_st = None
31
32 if x_st is None or x_st.st_mtime > workdir_st.st_mtime:
33 - writemsg_stdout(">>> Timestamp of "
34 - "%s has changed; recreating WORKDIR...\n" % x)
35 + writemsg_stdout(_(">>> Timestamp of "
36 + "%s has changed; recreating WORKDIR...\n") % x)
37 newstuff = True
38 break
39
40 @@ -726,7 +726,7 @@ def doebuild(myebuild, mydo, myroot, mysettings, debug=0, listonly=0,
41 builddir_lock.unlock()
42 builddir_lock = None
43 else:
44 - writemsg_stdout(">>> WORKDIR is up-to-date, keeping...\n")
45 + writemsg_stdout(_(">>> WORKDIR is up-to-date, keeping...\n"))
46 unpacked = True
47
48 # Build directory creation isn't required for any of these.
49 @@ -1362,11 +1362,11 @@ def spawnebuild(mydo, actionmap, mysettings, debug, alwaysdep=0,
50 check_file = os.path.join(
51 mysettings["PORTAGE_BUILDDIR"], ".%sed" % mydo.rstrip('e'))
52 if os.path.exists(check_file):
53 - writemsg_stdout(">>> It appears that "
54 - "'%s' has already executed for '%s'; skipping.\n" %
55 - (mydo, mysettings["PF"]))
56 - writemsg_stdout(">>> Remove '%s' to force %s.\n" %
57 - (check_file, mydo))
58 + writemsg_stdout(_(">>> It appears that "
59 + "'%(action)s' has already executed for '%(pkg)s'; skipping.\n") %
60 + {"action":mydo, "pkg":mysettings["PF"]})
61 + writemsg_stdout(_(">>> Remove '%(file)s' to force %(action)s.\n") %
62 + {"file":check_file, "action":mydo})
63 return os.EX_OK
64
65 return _spawn_phase(mydo, mysettings,