Fixed distcc-config bug

3 files changed, 32 insertions, 26 deletions

diff --git a/sys-devel/distcc/ChangeLog b/sys-devel/distcc/ChangeLog
index ee5a18b65c65..298152279814 100644
--- a/sys-devel/distcc/ChangeLog
+++ b/sys-devel/distcc/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-devel/distcc
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/ChangeLog,v 1.85 2003/12/06 17:31:03 lisa Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/ChangeLog,v 1.86 2003/12/11 15:51:51 pyrania Exp $
+
+  11 Dec 2003; Markus Nigbur <pyrania@gentoo.org> files/2.11.1p/distcc-config:
+  Fixed distcc-config. See bug #27432 for details.
 
   06 Dec 2003; Lisa Seelye <lisa@gentoo.org> files/2.11/distcc-config,
   files/2.11.1p/distcc-config:
diff --git a/sys-devel/distcc/Manifest b/sys-devel/distcc/Manifest
index 4027d04ad96b..8261a280de1c 100644
--- a/sys-devel/distcc/Manifest
+++ b/sys-devel/distcc/Manifest
@@ -1,31 +1,31 @@
-MD5 85e933f334cd09c026d4c8dc273825f0 ChangeLog 15228
-MD5 a1b583a4f17172ee9b85bfaecb7dee21 distcc-2.11.1.ebuild 3927
-MD5 16bbbf9b6b111668ff00046829e6b917 distcc-2.11.2-r1.ebuild 4051
-MD5 ba434fcebbfbd2db6cdbd7527edd2080 distcc-2.11.2.ebuild 4052
-MD5 6d0efb7bb3a7e30546d91844510da07d distcc-2.5-r1.ebuild 3215
 MD5 50800c649c3587e5f0dfef810410abb6 distcc-2.8-r2.ebuild 3365
+MD5 6d0efb7bb3a7e30546d91844510da07d distcc-2.5-r1.ebuild 3215
+MD5 a1b583a4f17172ee9b85bfaecb7dee21 distcc-2.11.1.ebuild 3927
 MD5 730d7f375b2a94bce7d91191789c4dc5 distcc-2.9.ebuild 3455
+MD5 16bbbf9b6b111668ff00046829e6b917 distcc-2.11.2-r1.ebuild 4051
+MD5 66a09224011772f756cfee0a3777f5f5 ChangeLog 15362
 MD5 70619e7eb5fa4fd0aa4f3588579cd50d metadata.xml 443
+MD5 ba434fcebbfbd2db6cdbd7527edd2080 distcc-2.11.2.ebuild 4052
+MD5 c09d755beeab4ae675a8352f4ee04c63 files/digest-distcc-2.11.2-r1 66
+MD5 ade4e8cda892045944e204fc2c3df8bd files/digest-distcc-2.9 63
 MD5 86e7b8c5c35c5e34e2adfe2c55369f7a files/digest-distcc-2.11.1 66
 MD5 c09d755beeab4ae675a8352f4ee04c63 files/digest-distcc-2.11.2 66
-MD5 c09d755beeab4ae675a8352f4ee04c63 files/digest-distcc-2.11.2-r1 66
 MD5 e1ecfcc1aad7c385cf3c41966277cda7 files/digest-distcc-2.5-r1 63
 MD5 56fd1ac60c1b8402e1632da62f32a890 files/digest-distcc-2.8-r2 63
-MD5 ade4e8cda892045944e204fc2c3df8bd files/digest-distcc-2.9 63
+MD5 41f782125d594b7249fcd1fc6c306b02 files/2.8/conf 592
+MD5 a985e7680ba7958cb9a170c8e2019e8e files/2.8/init 625
+MD5 ee4f0fde9d5e6fe88bf7f513cf12920c files/2.8/001_fix_tempfile.patch.gz 251
+MD5 9e01d7b626696716500bbf56c68a5680 files/2.8/distcc-config 7559
+MD5 05483b8174e619ee439b905cca85c7ad files/2.9/conf 592
+MD5 c400119892789344a9702d466476ddbd files/2.9/init 625
+MD5 63dd07135a46fcef934e3fa4c926d5f7 files/2.9/distcc-config 7559
+MD5 ced4e94d8c61a8f175d62a39478e7afc files/2.9/001_fix_tmpdir.patch.gz 248
 MD5 d69d2e510421afc34c73a9cb50c5fb0d files/2.10/conf 655
-MD5 3375d451fca8db4a3280b16679bc5858 files/2.10/distcc-config 7560
 MD5 813a6a43167076da271ef55188a77826 files/2.10/init 630
+MD5 3375d451fca8db4a3280b16679bc5858 files/2.10/distcc-config 7560
 MD5 e40dfa1f21a9a2301faaff21cf76e7d8 files/2.11/conf 655
-MD5 034d45b94b38d1410759852e4551373d files/2.11/distcc-config 7567
 MD5 c8ff220b60c105fcede2c72f274995db files/2.11/init 630
+MD5 034d45b94b38d1410759852e4551373d files/2.11/distcc-config 7567
 MD5 66c4af6f8dd87d270e5da50341ca6e14 files/2.11.1p/conf 658
-MD5 07aefc863b9fc1f2fdf9fca1988b1977 files/2.11.1p/distcc-config 4806
 MD5 606dd55609a04a0f21b9875259148332 files/2.11.1p/init 633
-MD5 ee4f0fde9d5e6fe88bf7f513cf12920c files/2.8/001_fix_tempfile.patch.gz 251
-MD5 41f782125d594b7249fcd1fc6c306b02 files/2.8/conf 592
-MD5 9e01d7b626696716500bbf56c68a5680 files/2.8/distcc-config 7559
-MD5 a985e7680ba7958cb9a170c8e2019e8e files/2.8/init 625
-MD5 ced4e94d8c61a8f175d62a39478e7afc files/2.9/001_fix_tmpdir.patch.gz 248
-MD5 05483b8174e619ee439b905cca85c7ad files/2.9/conf 592
-MD5 63dd07135a46fcef934e3fa4c926d5f7 files/2.9/distcc-config 7559
-MD5 c400119892789344a9702d466476ddbd files/2.9/init 625
+MD5 3828773f8d6cb9c7c4f2aa801e79b90c files/2.11.1p/distcc-config 4931
diff --git a/sys-devel/distcc/files/2.11.1p/distcc-config b/sys-devel/distcc/files/2.11.1p/distcc-config
index a5f303feeb75..fa88068b09fc 100644
--- a/sys-devel/distcc/files/2.11.1p/distcc-config
+++ b/sys-devel/distcc/files/2.11.1p/distcc-config
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/files/2.11.1p/distcc-config,v 1.3 2003/12/06 17:31:04 lisa Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/files/2.11.1p/distcc-config,v 1.4 2003/12/11 15:51:51 pyrania Exp $
 
 import os, re, signal, sys, commands, pwd
 from string import rstrip
@@ -101,14 +101,17 @@ if '--get-hosts' in tmpcmdline:
 		print HOSTS_ENV
 	elif os.path.exists(HOSTS_HOME) and os.path.getsize(HOSTS_HOME) != 0:
 		print HOSTS_HOME
-	else:
+	elif os.path.exists('/etc/distcc/hosts'):
 		print rstrip(open('/etc/distcc/hosts', 'r').read())
+	else:
+		print 'No configuration file found. Setup your hosts with --set-hosts.'
 elif '--set-hosts' in tmpcmdline:
 	if isroot(1):
-		FILE = '/etc/distcc/hosts'
+		PATH = '/etc/distcc'		
 	else:
-		FILE = os.environ.get('HOME')+'/hosts'
-	open(FILE, 'w').write(cmdline + '\n')
+		PATH = os.environ.get('HOME')
+	createdistccdir(PATH)
+	open(PATH+'/hosts', 'w').write(cmdline + '\n')
 elif '--get-verbose' in tmpcmdline:
 	readenv('DISTCC_VERBOSE')
 elif '--set-verbose' in tmpcmdline:
@@ -126,8 +129,8 @@ elif '--install' in tmpcmdline:
 	distcc_env.write('DCCC_PATH="/usr/lib/distcc/bin"\n')
 	distcc_env.write('DISTCC_VERBOSE="0"\n')
 	
-	if os.WEXITSTATUS(commands.getstatusoutput('/usr/sbin/useradd -u 240 -g daemon -s /bin/false -d /dev/null -c "distccd" distcc')[0]) == 9:
-		os.WEXITSTATUS(commands.getstatusoutput('/usr/sbin/usermod -u 240 -g daemon -s /bin/false -d /dev/null -c "distccd" distcc')[0])
+	if os.WEXITSTATUS(commands.getstatusoutput('/usr/sbin/useradd -g daemon -s /bin/false -d /dev/null -c "distccd" distcc')[0]) == 9:
+		os.WEXITSTATUS(commands.getstatusoutput('/usr/sbin/usermod -g daemon -s /bin/false -d /dev/null -c "distccd" distcc')[0])
 
 	foobar = pwd.getpwnam('distcc')
 	user   = foobar[2]