| 1 |
matsuu 08/10/27 21:29:45 |
| 2 |
|
| 3 |
Modified: distcc-config |
| 4 |
Removed: xinetd |
| 5 |
Log: |
| 6 |
Fixed xinetd issue and typo. Clean up distcc-config. Removed old revisions. |
| 7 |
(Portage version: 2.2_rc12/cvs/Linux 2.6.27-gentoo x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.3 sys-devel/distcc/files/3.0/distcc-config |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-devel/distcc/files/3.0/distcc-config?rev=1.3&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-devel/distcc/files/3.0/distcc-config?rev=1.3&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-devel/distcc/files/3.0/distcc-config?r1=1.2&r2=1.3 |
| 15 |
|
| 16 |
Index: distcc-config |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/sys-devel/distcc/files/3.0/distcc-config,v |
| 19 |
retrieving revision 1.2 |
| 20 |
retrieving revision 1.3 |
| 21 |
diff -u -r1.2 -r1.3 |
| 22 |
--- distcc-config 25 Oct 2008 06:39:17 -0000 1.2 |
| 23 |
+++ distcc-config 27 Oct 2008 21:29:44 -0000 1.3 |
| 24 |
@@ -1,10 +1,11 @@ |
| 25 |
#!/usr/bin/env python |
| 26 |
# Copyright 1999-2004 Gentoo Foundation |
| 27 |
# Distributed under the terms of the GNU General Public License v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/files/3.0/distcc-config,v 1.2 2008/10/25 06:39:17 matsuu Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/files/3.0/distcc-config,v 1.3 2008/10/27 21:29:44 matsuu Exp $ |
| 30 |
|
| 31 |
-import os, re, signal, sys, commands, pwd |
| 32 |
+import os, re, signal, sys |
| 33 |
from string import rstrip |
| 34 |
+from subprocess import Popen |
| 35 |
|
| 36 |
options=[ |
| 37 |
'--get-hosts', |
| 38 |
@@ -49,7 +50,7 @@ |
| 39 |
distcc_env[i] = var+'="'+value+'"\n' |
| 40 |
distcc_env_new.write(distcc_env[i]) |
| 41 |
#print 'Set',var,'to:',value |
| 42 |
- os.system('/usr/sbin/env-update') |
| 43 |
+ Popen('/usr/sbin/env-update', shell=True) |
| 44 |
print 'If you want to use these new settings in an existing shell,' |
| 45 |
print 'you need to "source /etc/profile" to get the changes.' |
| 46 |
|
| 47 |
@@ -82,7 +83,7 @@ |
| 48 |
if HOSTS_ENV: |
| 49 |
print HOSTS_ENV |
| 50 |
elif os.path.isfile(HOSTS_HOME) and os.path.getsize(HOSTS_HOME) != 0: |
| 51 |
- print HOSTS_HOME |
| 52 |
+ print rstrip(open(HOSTS_HOME, 'r').read()) |
| 53 |
elif os.path.exists('/etc/distcc/hosts'): |
| 54 |
print rstrip(open('/etc/distcc/hosts', 'r').read()) |
| 55 |
else: |
| 56 |
@@ -116,7 +117,7 @@ |
| 57 |
else: |
| 58 |
print '!!! Error: Awaiting two parameters.' |
| 59 |
else: |
| 60 |
- print 'Usage: /usr/bin/distcc-config --set-hosts DISTCC_HOSTS | --get-hosts' |
| 61 |
- print ' /usr/bin/distcc-config --set-verbose { 0 | 1 } | --get-verbose' |
| 62 |
- print ' /usr/bin/distcc-config --set-log FILE | --get-log' |
| 63 |
- print ' /usr/bin/distcc-config --set-env VARIABLE VALUE | --get-env [VARIABLE]' |
| 64 |
+ print 'Usage: %s --set-hosts DISTCC_HOSTS | --get-hosts' % sys.argv[0] |
| 65 |
+ print ' %s --set-verbose { 0 | 1 } | --get-verbose' % sys.argv[0] |
| 66 |
+ print ' %s --set-log FILE | --get-log' % sys.argv[0] |
| 67 |
+ print ' %s --set-env VARIABLE VALUE | --get-env [VARIABLE]' % sys.argv[0] |
Archives