summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2008-08-09 22:27:09 +0000
committerZac Medico <zmedico@gentoo.org>2008-08-09 22:27:09 +0000
commit216a57871f1f8b714e4816577b30f142567f4a63 (patch)
tree9dbb2e4373306a0fc56c8c97eeec6180ac5bc6b1
parentb0bd5c95409d88226cd4cc71d3c756175d300360 (diff)
downloadportage-216a57871f1f8b714e4816577b30f142567f4a63.tar.gz
portage-216a57871f1f8b714e4816577b30f142567f4a63.tar.bz2
portage-216a57871f1f8b714e4816577b30f142567f4a63.zip
* Use shlex.split() for splitting COLLISION_IGNORE.
* Define __all__. svn path=/main/trunk/; revision=11375
-rw-r--r--pym/portage/dbapi/vartree.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index 0355de6ba..7c08b233a 100644
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -2,6 +2,9 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
+__all__ = ["PreservedLibsRegistry", "LinkageMap",
+ "vardbapi", "vartree", "dblink"]
+
from portage.checksum import perform_md5
from portage.const import CACHE_PATH, CONFIG_MEMORY_FILE, PORTAGE_BIN_PATH, \
PRIVATE_PATH, VDB_PATH
@@ -29,6 +32,7 @@ from portage.elog.filtering import filter_mergephases, filter_unmergephases
import os, re, sys, stat, errno, commands, copy, time, subprocess
import logging
+import shlex
from itertools import izip
try:
@@ -2427,7 +2431,7 @@ class dblink(object):
def _collision_protect(self, srcroot, destroot, mypkglist, mycontents):
collision_ignore = set([normalize_path(myignore) for myignore in \
- self.settings.get("COLLISION_IGNORE", "").split()])
+ shlex.split(self.settings.get("COLLISION_IGNORE", ""))])
showMessage = self._display_merge
scheduler = self._scheduler