From: Fabian Groffen <grobian@gentoo.org>
Date: Fri, 2 Jul 2010 16:56:39 +0000 (+0200)
Subject: Merge remote branch 'overlays-gentoo-org/master' into prefix
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=66229e81112a43d1396afd5d4acdeadec6751697;p=portage.git

Merge remote branch 'overlays-gentoo-org/master' into prefix

Conflicts:
	pym/_emerge/actions.py
---

66229e81112a43d1396afd5d4acdeadec6751697
diff --cc bin/misc-functions.sh
index e11991f00,622676873..1622acc80
mode 100644,100755..100644
--- a/bin/misc-functions.sh
+++ b/bin/misc-functions.sh
@@@ -370,9 -332,11 +370,11 @@@ install_qa_check_misc() 
  
  	# Sanity check syntax errors in init.d scripts
  	for d in /etc/conf.d /etc/init.d ; do
 -		[[ -d ${D}/${d} ]] || continue
 -		for i in "${D}"/${d}/* ; do
 +		[[ -d ${ED}/${d} ]] || continue
 +		for i in "${ED}"/${d}/* ; do
  			[[ -L ${i} ]] && continue
+ 			# if empty conf.d/init.d dir exists (baselayout), then i will be "/etc/conf.d/*" and not exist
+ 			[[ ! -e ${i} ]] && continue
  			bash -n "${i}" || die "The init.d file has syntax errors: ${i}"
  		done
  	done
diff --cc pym/_emerge/actions.py
index 166492d68,af4380ed1..1ea3e81a5
--- a/pym/_emerge/actions.py
+++ b/pym/_emerge/actions.py
@@@ -2179,9 -2188,9 +2188,9 @@@ def action_sync(settings, trees, mtimed
  				out.eerror(line)
  			sys.exit(exitcode)
  	elif syncuri[:6]=="cvs://":
 -		if not os.path.exists("/usr/bin/cvs"):
 -			print("!!! /usr/bin/cvs does not exist, so CVS support is disabled.")
 +		if not os.path.exists(EPREFIX + "/usr/bin/cvs"):
 +			print("!!! " + EPREFIX + "/usr/bin/cvs does not exist, so CVS support is disabled.")
- 			print("!!! Type \"emerge dev-util/cvs\" to enable CVS support.")
+ 			print("!!! Type \"emerge dev-vcs/cvs\" to enable CVS support.")
  			sys.exit(1)
  		cvsroot=syncuri[6:]
  		cvsdir=os.path.dirname(myportdir)