Gentoo Archives: gentoo-commits

From: Brian Dolbec <brian.dolbec@×××××.com>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/portage:master commit in: pym/_emerge/
Date: Sun, 02 Mar 2014 03:15:55
Message-Id: 1393729862.a830a9acaa265a9558f1fa9aeaa3f814631494b9.dol-sen@gentoo
1 commit: a830a9acaa265a9558f1fa9aeaa3f814631494b9
2 Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
3 AuthorDate: Tue Jan 7 07:56:30 2014 +0000
4 Commit: Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
5 CommitDate: Sun Mar 2 03:11:02 2014 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=a830a9ac
7
8 Whitespace cleanup
9
10 ---
11 pym/_emerge/actions.py | 4 ++--
12 pym/_emerge/main.py | 6 +++---
13 2 files changed, 5 insertions(+), 5 deletions(-)
14
15 diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py
16 index 19659fd..2a1354b 100644
17 --- a/pym/_emerge/actions.py
18 +++ b/pym/_emerge/actions.py
19 @@ -3486,7 +3486,7 @@ def expand_set_arguments(myfiles, myaction, root_config):
20 unmerge_actions = ("unmerge", "prune", "clean", "depclean")
21
22 for a in myfiles:
23 - if a.startswith(SETPREFIX):
24 + if a.startswith(SETPREFIX):
25 s = a[len(SETPREFIX):]
26 if s not in sets:
27 display_missing_pkg_set(root_config, s)
28 @@ -3750,7 +3750,7 @@ def run_action(emerge_config):
29 if retval != os.EX_OK:
30 return retval
31
32 - # Need to handle empty sets specially, otherwise emerge will react
33 + # Need to handle empty sets specially, otherwise emerge will react
34 # with the help message for empty argument lists
35 if oldargs and not newargs:
36 print("emerge: no targets left after set expansion")
37
38 diff --git a/pym/_emerge/main.py b/pym/_emerge/main.py
39 index 1e21ddb..38bbd77 100644
40 --- a/pym/_emerge/main.py
41 +++ b/pym/_emerge/main.py
42 @@ -81,7 +81,7 @@ COWSAY_MOO = """
43 -----------------------
44 \ ^__^
45 \ (oo)\_______
46 - (__)\ )\/\
47 + (__)\ )\/\
48 ||----w |
49 || ||
50
51 @@ -583,7 +583,7 @@ def parse_opts(tmpcmdline, silent=False):
52 "packages that have been rebuilt",
53 "choices" : true_y_or_n
54 },
55 -
56 +
57 "--rebuilt-binaries-timestamp": {
58 "help" : "use only binaries that are newer than this " + \
59 "timestamp for --rebuilt-binaries",
60 @@ -893,7 +893,7 @@ def parse_opts(tmpcmdline, silent=False):
61 (myoptions.load_average,))
62
63 myoptions.load_average = load_average
64 -
65 +
66 if myoptions.rebuilt_binaries_timestamp:
67 try:
68 rebuilt_binaries_timestamp = int(myoptions.rebuilt_binaries_timestamp)