From: Fabian Groffen <grobian@gentoo.org>
Date: Mon, 6 Sep 2010 18:11:49 +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=aab75a6f0857fa1fd1b8897fe0b1d141e98bebdb;p=portage.git

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

Conflicts:
	pym/portage/dispatch_conf.py
---

aab75a6f0857fa1fd1b8897fe0b1d141e98bebdb
diff --cc bin/misc-functions.sh
index a175c0f17,fd0a21866..0f03fa77d
mode 100644,100755..100644
--- a/bin/misc-functions.sh
+++ b/bin/misc-functions.sh
@@@ -548,25 -507,21 +547,25 @@@ install_qa_check_misc() 
  	[[ ${abort} == "yes" ]] && die "add those ldscripts"
  
  	# Make sure people don't store libtool files or static libs in /lib
 -	f=$(ls "${D}"lib*/*.{a,la} 2>/dev/null)
 +	# on AIX, "dynamic libs" have extension .a, so don't get false
 +	# positives
 +	[[ ${CHOST} == *-aix* ]] \
 +		&& f=$(ls "${ED}"lib*/*.la 2>/dev/null || true) \
 +		|| f=$(ls "${ED}"lib*/*.{a,la} 2>/dev/null)
  	if [[ -n ${f} ]] ; then
- 		vecho -ne '\a\n'
+ 		vecho -ne '\n'
  		eqawarn "QA Notice: Excessive files found in the / partition"
  		eqawarn "${f}"
- 		vecho -ne '\a\n'
+ 		vecho -ne '\n'
  		die "static archives (*.a) and libtool library files (*.la) do not belong in /"
  	fi
  
  	# Verify that the libtool files don't contain bogus $D entries.
  	local abort=no gentoo_bug=no
 -	for a in "${D}"usr/lib*/*.la ; do
 +	for a in "${ED}"usr/lib*/*.la ; do
  		s=${a##*/}
  		if grep -qs "${D}" "${a}" ; then
- 			vecho -ne '\a\n'
+ 			vecho -ne '\n'
  			eqawarn "QA Notice: ${s} appears to contain PORTAGE_TMPDIR paths"
  			abort="yes"
  		fi
diff --cc pym/portage/dispatch_conf.py
index 037c1e25e,e51e5cd13..57e9b83de
--- a/pym/portage/dispatch_conf.py
+++ b/pym/portage/dispatch_conf.py
@@@ -14,8 -14,9 +14,10 @@@ try
  except ImportError:
      from commands import getstatusoutput as subprocess_getstatusoutput
  
- import portage, portage.const
+ import portage
+ from portage.env.loaders import KeyValuePairFileLoader
  from portage.localization import _
++from portage.const import EPREFIX
  
  RCS_BRANCH = '1.1.1'
  RCS_LOCK = 'rcs -ko -M -l'
@@@ -41,11 -42,11 +43,11 @@@ def diffstatusoutput_len(cmd)
          return (1, 1)
  
  def read_config(mandatory_opts):
-     loader = portage.env.loaders.KeyValuePairFileLoader(
-         portage.const.EPREFIX+'/etc/dispatch-conf.conf', None)
+     loader = KeyValuePairFileLoader(
 -        '/etc/dispatch-conf.conf', None)
++        EPREFIX + '/etc/dispatch-conf.conf', None)
      opts, errors = loader.load()
      if not opts:
-         print(_('dispatch-conf: Error reading %s/etc/dispatch-conf.conf; fatal') % (portage.const.EPREFIX,), file=sys.stderr)
 -        print(_('dispatch-conf: Error reading /etc/dispatch-conf.conf; fatal'), file=sys.stderr)
++        print(_('dispatch-conf: Error reading %s/etc/dispatch-conf.conf; fatal') % (EPREFIX,), file=sys.stderr)
          sys.exit(1)
  
  	# Handle quote removal here, since KeyValuePairFileLoader doesn't do that.