Gentoo Archives: gentoo-commits

From: "Paul Varner (fuzzyray)" <fuzzyray@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-portage/esearch/files: 186994-esync-quiet.patch
Date: Fri, 02 Jan 2009 17:25:50
Message-Id: E1LInmL-0001z0-Vj@stork.gentoo.org
1 fuzzyray 09/01/02 17:25:45
2
3 Modified: 186994-esync-quiet.patch
4 Log:
5 Updated patch for --quiet option (Bug #253455)
6 (Portage version: 2.2_rc20/cvs/Linux 2.6.23-gentoo-r8 i686)
7
8 Revision Changes Path
9 1.2 app-portage/esearch/files/186994-esync-quiet.patch
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-portage/esearch/files/186994-esync-quiet.patch?rev=1.2&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-portage/esearch/files/186994-esync-quiet.patch?rev=1.2&content-type=text/plain
13 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-portage/esearch/files/186994-esync-quiet.patch?r1=1.1&r2=1.2
14
15 Index: 186994-esync-quiet.patch
16 ===================================================================
17 RCS file: /var/cvsroot/gentoo-x86/app-portage/esearch/files/186994-esync-quiet.patch,v
18 retrieving revision 1.1
19 retrieving revision 1.2
20 diff -u -r1.1 -r1.2
21 --- 186994-esync-quiet.patch 1 Jan 2009 02:39:33 -0000 1.1
22 +++ 186994-esync-quiet.patch 2 Jan 2009 17:25:45 -0000 1.2
23 @@ -1,6 +1,6 @@
24 -diff -ru esearch.orig/en/esync.1 esearch/en/esync.1
25 ---- esearch.orig/en/esync.1 2008-12-31 20:00:18.000000000 -0600
26 -+++ esearch/en/esync.1 2008-12-31 20:06:17.000000000 -0600
27 +diff -ru esearch-0.7.1-r6/en/esync.1 esearch-0.7.1-r7/en/esync.1
28 +--- esearch-0.7.1-r6/en/esync.1 2009-01-02 10:53:39.000000000 -0600
29 ++++ esearch-0.7.1-r7/en/esync.1 2009-01-02 10:45:03.000000000 -0600
30 @@ -1,34 +1,36 @@
31 -.TH esearch 1 "February 13, 2005" "esync"
32 -
33 @@ -50,11 +50,18 @@
34 .B \-\-nospinner, \­s
35 Don't display the remaining index count
36
37 -Only in esearch/en: esync.1.orig
38 -diff -ru esearch.orig/esync.py esearch/esync.py
39 ---- esearch.orig/esync.py 2008-12-31 20:00:19.000000000 -0600
40 -+++ esearch/esync.py 2008-12-31 20:04:17.000000000 -0600
41 -@@ -53,6 +53,9 @@
42 +diff -ru esearch-0.7.1-r6/esync.py esearch-0.7.1-r7/esync.py
43 +--- esearch-0.7.1-r6/esync.py 2009-01-02 10:53:40.000000000 -0600
44 ++++ esearch-0.7.1-r7/esync.py 2009-01-02 10:50:59.000000000 -0600
45 +@@ -35,6 +35,7 @@
46 + eupdatedb_extra_options = ""
47 + showtitles = "notitles" not in portage.features
48 + verbose = False
49 ++quiet = False
50 +
51 + def usage():
52 + print "esync (0.7.1) - Calls 'emerge sync' and 'eupdatedb' and shows updates"
53 +@@ -53,6 +54,9 @@
54 print darkgreen(" --nocolor") + ", " + darkgreen("-n")
55 print " Don't use ANSI codes for colored output"
56 print ""
57 @@ -64,7 +71,7 @@
58 print darkgreen(" --verbose") + ", " + darkgreen("-v")
59 print " Verbose output"
60 print ""
61 -@@ -63,7 +66,7 @@
62 +@@ -63,7 +67,7 @@
63 sys.exit(0)
64
65 try:
66 @@ -73,7 +80,7 @@
67 except GetoptError, error:
68 print red(" * Error:"), error, "(see", darkgreen("--help"), "for all options)"
69 print
70 -@@ -82,8 +85,13 @@
71 +@@ -82,8 +86,13 @@
72 eoptions = "-n"
73 nocolor()
74 showtitles = False
75 @@ -87,7 +94,7 @@
76 elif arg in ("-s", "--nospinner"):
77 eupdatedb_extra_options = "-q"
78
79 -@@ -92,6 +100,7 @@
80 +@@ -92,6 +101,7 @@
81 global showtitles
82 if showtitles:
83 xtermTitle(msg)
84 @@ -95,7 +102,7 @@
85 print green(" *"), msg
86
87 def outofdateerror():
88 -@@ -131,9 +140,9 @@
89 +@@ -131,9 +141,9 @@
90
91 tree_old = gettree("old")
92
93 @@ -107,7 +114,7 @@
94 errorcode = os.system(syncprogram + " | tee " + logfile_sync + " 2>&1")
95 else:
96 errorcode = os.system(syncprogram + " > " + logfile_sync + " 2>&1")
97 -@@ -143,16 +152,17 @@
98 +@@ -143,16 +153,17 @@
99 print ""
100 sys.exit(1)
101
102 @@ -129,7 +136,7 @@
103
104 tree_new = gettree("new")
105
106 -@@ -181,6 +191,7 @@
107 +@@ -181,6 +192,7 @@
108 if (pkg not in old_keys) or (old[pkg] != new[pkg]):
109 os.system("/usr/bin/esearch " + eoptions + " -Fc ^" + pkg + "$ | head -n1")
110 haspkg = True