[gentoo-commits] portage r13715 - main/branches/prefix/pym/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] portage r13715 - main/branches/prefix/pym/_emerge
@ 2009-06-27 14:44 Fabian Groffen (grobian)
  0 siblings, 0 replies; only message in thread
From: Fabian Groffen (grobian) @ 2009-06-27 14:44 UTC (permalink / raw
  To: gentoo-commits

Author: grobian
Date: 2009-06-27 14:44:56 +0000 (Sat, 27 Jun 2009)
New Revision: 13715

Modified:
   main/branches/prefix/pym/_emerge/AbstractDepPriority.py
   main/branches/prefix/pym/_emerge/AbstractPollTask.py
   main/branches/prefix/pym/_emerge/AsynchronousTask.py
   main/branches/prefix/pym/_emerge/AtomArg.py
   main/branches/prefix/pym/_emerge/Binpkg.py
   main/branches/prefix/pym/_emerge/BinpkgExtractorAsync.py
   main/branches/prefix/pym/_emerge/BinpkgFetcher.py
   main/branches/prefix/pym/_emerge/BinpkgPrefetcher.py
   main/branches/prefix/pym/_emerge/BinpkgVerifier.py
   main/branches/prefix/pym/_emerge/Blocker.py
   main/branches/prefix/pym/_emerge/BlockerCache.py
   main/branches/prefix/pym/_emerge/BlockerDB.py
   main/branches/prefix/pym/_emerge/BlockerDepPriority.py
   main/branches/prefix/pym/_emerge/CompositeTask.py
   main/branches/prefix/pym/_emerge/DepPriority.py
   main/branches/prefix/pym/_emerge/DepPriorityNormalRange.py
   main/branches/prefix/pym/_emerge/DepPrioritySatisfiedRange.py
   main/branches/prefix/pym/_emerge/Dependency.py
   main/branches/prefix/pym/_emerge/DependencyArg.py
   main/branches/prefix/pym/_emerge/EbuildBinpkg.py
   main/branches/prefix/pym/_emerge/EbuildBuild.py
   main/branches/prefix/pym/_emerge/EbuildBuildDir.py
   main/branches/prefix/pym/_emerge/EbuildExecuter.py
   main/branches/prefix/pym/_emerge/EbuildFetcher.py
   main/branches/prefix/pym/_emerge/EbuildFetchonly.py
   main/branches/prefix/pym/_emerge/EbuildMerge.py
   main/branches/prefix/pym/_emerge/EbuildMetadataPhase.py
   main/branches/prefix/pym/_emerge/EbuildPhase.py
   main/branches/prefix/pym/_emerge/EbuildProcess.py
   main/branches/prefix/pym/_emerge/FakeVartree.py
   main/branches/prefix/pym/_emerge/JobStatusDisplay.py
   main/branches/prefix/pym/_emerge/MergeListItem.py
   main/branches/prefix/pym/_emerge/MetadataRegen.py
   main/branches/prefix/pym/_emerge/MiscFunctionsProcess.py
   main/branches/prefix/pym/_emerge/Package.py
   main/branches/prefix/pym/_emerge/PackageArg.py
   main/branches/prefix/pym/_emerge/PackageCounters.py
   main/branches/prefix/pym/_emerge/PackageMerge.py
   main/branches/prefix/pym/_emerge/PackageUninstall.py
   main/branches/prefix/pym/_emerge/PackageVirtualDbapi.py
   main/branches/prefix/pym/_emerge/PipeReader.py
   main/branches/prefix/pym/_emerge/PollConstants.py
   main/branches/prefix/pym/_emerge/PollScheduler.py
   main/branches/prefix/pym/_emerge/PollSelectAdapter.py
   main/branches/prefix/pym/_emerge/ProgressHandler.py
   main/branches/prefix/pym/_emerge/QueueScheduler.py
   main/branches/prefix/pym/_emerge/RepoDisplay.py
   main/branches/prefix/pym/_emerge/RootConfig.py
   main/branches/prefix/pym/_emerge/Scheduler.py
   main/branches/prefix/pym/_emerge/SequentialTaskQueue.py
   main/branches/prefix/pym/_emerge/SetArg.py
   main/branches/prefix/pym/_emerge/SlotObject.py
   main/branches/prefix/pym/_emerge/SpawnProcess.py
   main/branches/prefix/pym/_emerge/SubProcess.py
   main/branches/prefix/pym/_emerge/Task.py
   main/branches/prefix/pym/_emerge/TaskScheduler.py
   main/branches/prefix/pym/_emerge/TaskSequence.py
   main/branches/prefix/pym/_emerge/UninstallFailure.py
   main/branches/prefix/pym/_emerge/UnmergeDepPriority.py
   main/branches/prefix/pym/_emerge/UseFlagDisplay.py
   main/branches/prefix/pym/_emerge/__init__.py
   main/branches/prefix/pym/_emerge/_find_deep_system_runtime_deps.py
   main/branches/prefix/pym/_emerge/_flush_elog_mod_echo.py
   main/branches/prefix/pym/_emerge/actions.py
   main/branches/prefix/pym/_emerge/changelog.py
   main/branches/prefix/pym/_emerge/clear_caches.py
   main/branches/prefix/pym/_emerge/countdown.py
   main/branches/prefix/pym/_emerge/create_depgraph_params.py
   main/branches/prefix/pym/_emerge/create_world_atom.py
   main/branches/prefix/pym/_emerge/depgraph.py
   main/branches/prefix/pym/_emerge/emergelog.py
   main/branches/prefix/pym/_emerge/format_size.py
   main/branches/prefix/pym/_emerge/getloadavg.py
   main/branches/prefix/pym/_emerge/help.py
   main/branches/prefix/pym/_emerge/is_valid_package_atom.py
   main/branches/prefix/pym/_emerge/search.py
   main/branches/prefix/pym/_emerge/show_invalid_depstring_notice.py
   main/branches/prefix/pym/_emerge/stdout_spinner.py
   main/branches/prefix/pym/_emerge/unmerge.py
   main/branches/prefix/pym/_emerge/userquery.py
   main/branches/prefix/pym/_emerge/visible.py
Log:
   Merged from trunk -r13688:13690

   | 13689   | Split out a depgraph._iter_match_pkgs() method from          |
   | zmedico | _select_pkg_highest_available_imp().                         |
   
   | 13690   | Add/update copyright headers.                                |
   | zmedico |                                                              |


Modified: main/branches/prefix/pym/_emerge/AbstractDepPriority.py
===================================================================
--- main/branches/prefix/pym/_emerge/AbstractDepPriority.py	2009-06-27 14:32:58 UTC (rev 13714)
+++ main/branches/prefix/pym/_emerge/AbstractDepPriority.py	2009-06-27 14:44:56 UTC (rev 13715)
@@ -1,3 +1,7 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
 from _emerge.SlotObject import SlotObject
 class AbstractDepPriority(SlotObject):
 	__slots__ = ("buildtime", "runtime", "runtime_post")

Modified: main/branches/prefix/pym/_emerge/AbstractPollTask.py
===================================================================
--- main/branches/prefix/pym/_emerge/AbstractPollTask.py	2009-06-27 14:32:58 UTC (rev 13714)
+++ main/branches/prefix/pym/_emerge/AbstractPollTask.py	2009-06-27 14:44:56 UTC (rev 13715)
@@ -1,3 +1,7 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
 from _emerge.AsynchronousTask import AsynchronousTask
 from _emerge.PollConstants import PollConstants
 class AbstractPollTask(AsynchronousTask):

Modified: main/branches/prefix/pym/_emerge/AsynchronousTask.py
===================================================================
--- main/branches/prefix/pym/_emerge/AsynchronousTask.py	2009-06-27 14:32:58 UTC (rev 13714)
+++ main/branches/prefix/pym/_emerge/AsynchronousTask.py	2009-06-27 14:44:56 UTC (rev 13715)
@@ -1,3 +1,7 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
 from _emerge.SlotObject import SlotObject
 class AsynchronousTask(SlotObject):
 	"""

Modified: main/branches/prefix/pym/_emerge/AtomArg.py
===================================================================
--- main/branches/prefix/pym/_emerge/AtomArg.py	2009-06-27 14:32:58 UTC (rev 13714)
+++ main/branches/prefix/pym/_emerge/AtomArg.py	2009-06-27 14:44:56 UTC (rev 13715)
@@ -1,3 +1,7 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
 from _emerge.DependencyArg import DependencyArg
 
 # for an explanation on this logic, see pym/_emerge/__init__.py

Modified: main/branches/prefix/pym/_emerge/Binpkg.py
===================================================================
--- main/branches/prefix/pym/_emerge/Binpkg.py	2009-06-27 14:32:58 UTC (rev 13714)
+++ main/branches/prefix/pym/_emerge/Binpkg.py	2009-06-27 14:44:56 UTC (rev 13715)
@@ -1,3 +1,7 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
 from _emerge.EbuildPhase import EbuildPhase
 from _emerge.BinpkgFetcher import BinpkgFetcher
 from _emerge.BinpkgExtractorAsync import BinpkgExtractorAsync

Modified: main/branches/prefix/pym/_emerge/BinpkgExtractorAsync.py
===================================================================
--- main/branches/prefix/pym/_emerge/BinpkgExtractorAsync.py	2009-06-27 14:32:58 UTC (rev 13714)
+++ main/branches/prefix/pym/_emerge/BinpkgExtractorAsync.py	2009-06-27 14:44:56 UTC (rev 13715)
@@ -1,3 +1,7 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
 from _emerge.SpawnProcess import SpawnProcess
 # for an explanation on this logic, see pym/_emerge/__init__.py
 import os

Modified: main/branches/prefix/pym/_emerge/BinpkgFetcher.py
===================================================================
--- main/branches/prefix/pym/_emerge/BinpkgFetcher.py	2009-06-27 14:32:58 UTC (rev 13714)
+++ main/branches/prefix/pym/_emerge/BinpkgFetcher.py	2009-06-27 14:44:56 UTC (rev 13715)
@@ -1,3 +1,7 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
 from _emerge.SpawnProcess import SpawnProcess
 import urlparse
 import sys

Modified: main/branches/prefix/pym/_emerge/BinpkgPrefetcher.py
===================================================================
--- main/branches/prefix/pym/_emerge/BinpkgPrefetcher.py	2009-06-27 14:32:58 UTC (rev 13714)
+++ main/branches/prefix/pym/_emerge/BinpkgPrefetcher.py	2009-06-27 14:44:56 UTC (rev 13715)
@@ -1,3 +1,7 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
 from _emerge.BinpkgFetcher import BinpkgFetcher
 from _emerge.CompositeTask import CompositeTask
 from _emerge.BinpkgVerifier import BinpkgVerifier

Modified: main/branches/prefix/pym/_emerge/BinpkgVerifier.py
===================================================================
--- main/branches/prefix/pym/_emerge/BinpkgVerifier.py	2009-06-27 14:32:58 UTC (rev 13714)
+++ main/branches/prefix/pym/_emerge/BinpkgVerifier.py	2009-06-27 14:44:56 UTC (rev 13715)
@@ -1,3 +1,7 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
 from _emerge.AsynchronousTask import AsynchronousTask
 from portage.util import writemsg
 import sys

Modified: main/branches/prefix/pym/_emerge/Blocker.py
===================================================================
--- main/branches/prefix/pym/_emerge/Blocker.py	2009-06-27 14:32:58 UTC (rev 13714)
+++ main/branches/prefix/pym/_emerge/Blocker.py	2009-06-27 14:44:56 UTC (rev 13715)
@@ -1,3 +1,7 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
 from _emerge.Task import Task
 # for an explanation on this logic, see pym/_emerge/__init__.py
 import os

Modified: main/branches/prefix/pym/_emerge/BlockerCache.py
===================================================================
--- main/branches/prefix/pym/_emerge/BlockerCache.py	2009-06-27 14:32:58 UTC (rev 13714)
+++ main/branches/prefix/pym/_emerge/BlockerCache.py	2009-06-27 14:44:56 UTC (rev 13715)
@@ -1,3 +1,7 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
 from portage.util import writemsg
 from portage.data import secpass
 # for an explanation on this logic, see pym/_emerge/__init__.py

Modified: main/branches/prefix/pym/_emerge/BlockerDB.py
===================================================================
--- main/branches/prefix/pym/_emerge/BlockerDB.py	2009-06-27 14:32:58 UTC (rev 13714)
+++ main/branches/prefix/pym/_emerge/BlockerDB.py	2009-06-27 14:44:56 UTC (rev 13715)
@@ -1,3 +1,7 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
 # for an explanation on this logic, see pym/_emerge/__init__.py
 import os
 import sys

Modified: main/branches/prefix/pym/_emerge/BlockerDepPriority.py
===================================================================
--- main/branches/prefix/pym/_emerge/BlockerDepPriority.py	2009-06-27 14:32:58 UTC (rev 13714)
+++ main/branches/prefix/pym/_emerge/BlockerDepPriority.py	2009-06-27 14:44:56 UTC (rev 13715)
@@ -1,3 +1,7 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
 from _emerge.DepPriority import DepPriority
 class BlockerDepPriority(DepPriority):
 	__slots__ = ()

Modified: main/branches/prefix/pym/_emerge/CompositeTask.py
===================================================================
--- main/branches/prefix/pym/_emerge/CompositeTask.py	2009-06-27 14:32:58 UTC (rev 13714)
+++ main/branches/prefix/pym/_emerge/CompositeTask.py	2009-06-27 14:44:56 UTC (rev 13715)
@@ -1,3 +1,7 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
 from _emerge.AsynchronousTask import AsynchronousTask
 import os
 class CompositeTask(AsynchronousTask):

Modified: main/branches/prefix/pym/_emerge/DepPriority.py
===================================================================
--- main/branches/prefix/pym/_emerge/DepPriority.py	2009-06-27 14:32:58 UTC (rev 13714)
+++ main/branches/prefix/pym/_emerge/DepPriority.py	2009-06-27 14:44:56 UTC (rev 13715)
@@ -1,3 +1,7 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
 from _emerge.AbstractDepPriority import AbstractDepPriority
 class DepPriority(AbstractDepPriority):
 

Modified: main/branches/prefix/pym/_emerge/DepPriorityNormalRange.py
===================================================================
--- main/branches/prefix/pym/_emerge/DepPriorityNormalRange.py	2009-06-27 14:32:58 UTC (rev 13714)
+++ main/branches/prefix/pym/_emerge/DepPriorityNormalRange.py	2009-06-27 14:44:56 UTC (rev 13715)
@@ -1,3 +1,7 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
 from _emerge.DepPriority import DepPriority
 class DepPriorityNormalRange(object):
 	"""

Modified: main/branches/prefix/pym/_emerge/DepPrioritySatisfiedRange.py
===================================================================
--- main/branches/prefix/pym/_emerge/DepPrioritySatisfiedRange.py	2009-06-27 14:32:58 UTC (rev 13714)
+++ main/branches/prefix/pym/_emerge/DepPrioritySatisfiedRange.py	2009-06-27 14:44:56 UTC (rev 13715)
@@ -1,3 +1,7 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
 from _emerge.DepPriority import DepPriority
 class DepPrioritySatisfiedRange(object):
 	"""

Modified: main/branches/prefix/pym/_emerge/Dependency.py
===================================================================
--- main/branches/prefix/pym/_emerge/Dependency.py	2009-06-27 14:32:58 UTC (rev 13714)
+++ main/branches/prefix/pym/_emerge/Dependency.py	2009-06-27 14:44:56 UTC (rev 13715)
@@ -1,3 +1,7 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
 from _emerge.DepPriority import DepPriority
 from _emerge.SlotObject import SlotObject
 class Dependency(SlotObject):

Modified: main/branches/prefix/pym/_emerge/DependencyArg.py
===================================================================
--- main/branches/prefix/pym/_emerge/DependencyArg.py	2009-06-27 14:32:58 UTC (rev 13714)
+++ main/branches/prefix/pym/_emerge/DependencyArg.py	2009-06-27 14:44:56 UTC (rev 13715)
@@ -1,3 +1,7 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
 class DependencyArg(object):
 	def __init__(self, arg=None, root_config=None):
 		self.arg = arg

Modified: main/branches/prefix/pym/_emerge/EbuildBinpkg.py
===================================================================
--- main/branches/prefix/pym/_emerge/EbuildBinpkg.py	2009-06-27 14:32:58 UTC (rev 13714)
+++ main/branches/prefix/pym/_emerge/EbuildBinpkg.py	2009-06-27 14:44:56 UTC (rev 13715)
@@ -1,3 +1,7 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
 from _emerge.EbuildProcess import EbuildProcess
 import os
 class EbuildBinpkg(EbuildProcess):

Modified: main/branches/prefix/pym/_emerge/EbuildBuild.py
===================================================================
--- main/branches/prefix/pym/_emerge/EbuildBuild.py	2009-06-27 14:32:58 UTC (rev 13714)
+++ main/branches/prefix/pym/_emerge/EbuildBuild.py	2009-06-27 14:44:56 UTC (rev 13715)
@@ -1,3 +1,7 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
 from _emerge.EbuildExecuter import EbuildExecuter
 from _emerge.EbuildPhase import EbuildPhase
 from _emerge.EbuildBinpkg import EbuildBinpkg

Modified: main/branches/prefix/pym/_emerge/EbuildBuildDir.py
===================================================================
--- main/branches/prefix/pym/_emerge/EbuildBuildDir.py	2009-06-27 14:32:58 UTC (rev 13714)
+++ main/branches/prefix/pym/_emerge/EbuildBuildDir.py	2009-06-27 14:44:56 UTC (rev 13715)
@@ -1,3 +1,7 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
 from _emerge.SlotObject import SlotObject
 # for an explanation on this logic, see pym/_emerge/__init__.py
 import os

Modified: main/branches/prefix/pym/_emerge/EbuildExecuter.py
===================================================================
--- main/branches/prefix/pym/_emerge/EbuildExecuter.py	2009-06-27 14:32:58 UTC (rev 13714)
+++ main/branches/prefix/pym/_emerge/EbuildExecuter.py	2009-06-27 14:44:56 UTC (rev 13715)
@@ -1,3 +1,7 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
 from _emerge.EbuildPhase import EbuildPhase
 from _emerge.TaskSequence import TaskSequence
 from _emerge.CompositeTask import CompositeTask

Modified: main/branches/prefix/pym/_emerge/EbuildFetcher.py
===================================================================
--- main/branches/prefix/pym/_emerge/EbuildFetcher.py	2009-06-27 14:32:58 UTC (rev 13714)
+++ main/branches/prefix/pym/_emerge/EbuildFetcher.py	2009-06-27 14:44:56 UTC (rev 13715)
@@ -1,3 +1,7 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
 from _emerge.SpawnProcess import SpawnProcess
 from _emerge.EbuildBuildDir import EbuildBuildDir
 # for an explanation on this logic, see pym/_emerge/__init__.py

Modified: main/branches/prefix/pym/_emerge/EbuildFetchonly.py
===================================================================
--- main/branches/prefix/pym/_emerge/EbuildFetchonly.py	2009-06-27 14:32:58 UTC (rev 13714)
+++ main/branches/prefix/pym/_emerge/EbuildFetchonly.py	2009-06-27 14:44:56 UTC (rev 13715)
@@ -1,3 +1,7 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
 from _emerge.SlotObject import SlotObject
 import shutil
 # for an explanation on this logic, see pym/_emerge/__init__.py

Modified: main/branches/prefix/pym/_emerge/EbuildMerge.py
===================================================================
--- main/branches/prefix/pym/_emerge/EbuildMerge.py	2009-06-27 14:32:58 UTC (rev 13714)
+++ main/branches/prefix/pym/_emerge/EbuildMerge.py	2009-06-27 14:44:56 UTC (rev 13715)
@@ -1,3 +1,7 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
 from _emerge.SlotObject import SlotObject
 # for an explanation on this logic, see pym/_emerge/__init__.py
 import os

Modified: main/branches/prefix/pym/_emerge/EbuildMetadataPhase.py
===================================================================
--- main/branches/prefix/pym/_emerge/EbuildMetadataPhase.py	2009-06-27 14:32:58 UTC (rev 13714)
+++ main/branches/prefix/pym/_emerge/EbuildMetadataPhase.py	2009-06-27 14:44:56 UTC (rev 13715)
@@ -1,3 +1,7 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
 from _emerge.SubProcess import SubProcess
 from _emerge.PollConstants import PollConstants
 import sys

Modified: main/branches/prefix/pym/_emerge/EbuildPhase.py
===================================================================
--- main/branches/prefix/pym/_emerge/EbuildPhase.py	2009-06-27 14:32:58 UTC (rev 13714)
+++ main/branches/prefix/pym/_emerge/EbuildPhase.py	2009-06-27 14:44:56 UTC (rev 13715)
@@ -1,3 +1,7 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
 from _emerge.MiscFunctionsProcess import MiscFunctionsProcess
 from _emerge.EbuildProcess import EbuildProcess
 from _emerge.CompositeTask import CompositeTask

Modified: main/branches/prefix/pym/_emerge/EbuildProcess.py
===================================================================
--- main/branches/prefix/pym/_emerge/EbuildProcess.py	2009-06-27 14:32:58 UTC (rev 13714)
+++ main/branches/prefix/pym/_emerge/EbuildProcess.py	2009-06-27 14:44:56 UTC (rev 13715)
@@ -1,3 +1,7 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
 from _emerge.SpawnProcess import SpawnProcess
 # for an explanation on this logic, see pym/_emerge/__init__.py
 import os

Modified: main/branches/prefix/pym/_emerge/FakeVartree.py
===================================================================
--- main/branches/prefix/pym/_emerge/FakeVartree.py	2009-06-27 14:32:58 UTC (rev 13714)
+++ main/branches/prefix/pym/_emerge/FakeVartree.py	2009-06-27 14:44:56 UTC (rev 13715)
@@ -1,3 +1,7 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
 import os
 from itertools import izip
 

Modified: main/branches/prefix/pym/_emerge/JobStatusDisplay.py
===================================================================
--- main/branches/prefix/pym/_emerge/JobStatusDisplay.py	2009-06-27 14:32:58 UTC (rev 13714)
+++ main/branches/prefix/pym/_emerge/JobStatusDisplay.py	2009-06-27 14:44:56 UTC (rev 13715)
@@ -1,3 +1,7 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
 import formatter
 import os
 import sys

Modified: main/branches/prefix/pym/_emerge/MergeListItem.py
===================================================================
--- main/branches/prefix/pym/_emerge/MergeListItem.py	2009-06-27 14:32:58 UTC (rev 13714)
+++ main/branches/prefix/pym/_emerge/MergeListItem.py	2009-06-27 14:44:56 UTC (rev 13715)
@@ -1,3 +1,7 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
 import os
 
 from portage.output import colorize

Modified: main/branches/prefix/pym/_emerge/MetadataRegen.py
===================================================================
--- main/branches/prefix/pym/_emerge/MetadataRegen.py	2009-06-27 14:32:58 UTC (rev 13714)
+++ main/branches/prefix/pym/_emerge/MetadataRegen.py	2009-06-27 14:44:56 UTC (rev 13715)
@@ -1,3 +1,7 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
 # for an explanation on this logic, see pym/_emerge/__init__.py
 import os
 import sys

Modified: main/branches/prefix/pym/_emerge/MiscFunctionsProcess.py
===================================================================
--- main/branches/prefix/pym/_emerge/MiscFunctionsProcess.py	2009-06-27 14:32:58 UTC (rev 13714)
+++ main/branches/prefix/pym/_emerge/MiscFunctionsProcess.py	2009-06-27 14:44:56 UTC (rev 13715)
@@ -1,3 +1,7 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
 from _emerge.SpawnProcess import SpawnProcess
 # for an explanation on this logic, see pym/_emerge/__init__.py
 import os

Modified: main/branches/prefix/pym/_emerge/Package.py
===================================================================
--- main/branches/prefix/pym/_emerge/Package.py	2009-06-27 14:32:58 UTC (rev 13714)
+++ main/branches/prefix/pym/_emerge/Package.py	2009-06-27 14:44:56 UTC (rev 13715)
@@ -1,3 +1,7 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
 import re
 from itertools import chain
 

Modified: main/branches/prefix/pym/_emerge/PackageArg.py
===================================================================
--- main/branches/prefix/pym/_emerge/PackageArg.py	2009-06-27 14:32:58 UTC (rev 13714)
+++ main/branches/prefix/pym/_emerge/PackageArg.py	2009-06-27 14:44:56 UTC (rev 13715)
@@ -1,3 +1,7 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
 from _emerge.DependencyArg import DependencyArg
 # for an explanation on this logic, see pym/_emerge/__init__.py
 import os

Modified: main/branches/prefix/pym/_emerge/PackageCounters.py
===================================================================
--- main/branches/prefix/pym/_emerge/PackageCounters.py	2009-06-27 14:32:58 UTC (rev 13714)
+++ main/branches/prefix/pym/_emerge/PackageCounters.py	2009-06-27 14:44:56 UTC (rev 13715)
@@ -1,3 +1,7 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
 from portage.output import colorize, create_color_func
 bad = create_color_func("BAD")
 

Modified: main/branches/prefix/pym/_emerge/PackageMerge.py
===================================================================
--- main/branches/prefix/pym/_emerge/PackageMerge.py	2009-06-27 14:32:58 UTC (rev 13714)
+++ main/branches/prefix/pym/_emerge/PackageMerge.py	2009-06-27 14:44:56 UTC (rev 13715)
@@ -1,3 +1,7 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
 from _emerge.AsynchronousTask import AsynchronousTask
 from portage.output import colorize
 class PackageMerge(AsynchronousTask):

Modified: main/branches/prefix/pym/_emerge/PackageUninstall.py
===================================================================
--- main/branches/prefix/pym/_emerge/PackageUninstall.py	2009-06-27 14:32:58 UTC (rev 13714)
+++ main/branches/prefix/pym/_emerge/PackageUninstall.py	2009-06-27 14:44:56 UTC (rev 13715)
@@ -1,3 +1,7 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
 import logging
 # for an explanation on this logic, see pym/_emerge/__init__.py
 import os

Modified: main/branches/prefix/pym/_emerge/PackageVirtualDbapi.py
===================================================================
--- main/branches/prefix/pym/_emerge/PackageVirtualDbapi.py	2009-06-27 14:32:58 UTC (rev 13714)
+++ main/branches/prefix/pym/_emerge/PackageVirtualDbapi.py	2009-06-27 14:44:56 UTC (rev 13715)
@@ -1,3 +1,7 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
 # for an explanation on this logic, see pym/_emerge/__init__.py
 import os
 import sys

Modified: main/branches/prefix/pym/_emerge/PipeReader.py
===================================================================
--- main/branches/prefix/pym/_emerge/PipeReader.py	2009-06-27 14:32:58 UTC (rev 13714)
+++ main/branches/prefix/pym/_emerge/PipeReader.py	2009-06-27 14:44:56 UTC (rev 13715)
@@ -1,3 +1,7 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
 from _emerge.AbstractPollTask import AbstractPollTask
 from _emerge.PollConstants import PollConstants
 import sys

Modified: main/branches/prefix/pym/_emerge/PollConstants.py
===================================================================
--- main/branches/prefix/pym/_emerge/PollConstants.py	2009-06-27 14:32:58 UTC (rev 13714)
+++ main/branches/prefix/pym/_emerge/PollConstants.py	2009-06-27 14:44:56 UTC (rev 13715)
@@ -1,3 +1,7 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
 import select
 class PollConstants(object):
 

Modified: main/branches/prefix/pym/_emerge/PollScheduler.py
===================================================================
--- main/branches/prefix/pym/_emerge/PollScheduler.py	2009-06-27 14:32:58 UTC (rev 13714)
+++ main/branches/prefix/pym/_emerge/PollScheduler.py	2009-06-27 14:44:56 UTC (rev 13715)
@@ -1,3 +1,7 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
 import logging
 import select
 

Modified: main/branches/prefix/pym/_emerge/PollSelectAdapter.py
===================================================================
--- main/branches/prefix/pym/_emerge/PollSelectAdapter.py	2009-06-27 14:32:58 UTC (rev 13714)
+++ main/branches/prefix/pym/_emerge/PollSelectAdapter.py	2009-06-27 14:44:56 UTC (rev 13715)
@@ -1,3 +1,7 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
 from _emerge.PollConstants import PollConstants
 import select
 class PollSelectAdapter(PollConstants):

Modified: main/branches/prefix/pym/_emerge/ProgressHandler.py
===================================================================
--- main/branches/prefix/pym/_emerge/ProgressHandler.py	2009-06-27 14:32:58 UTC (rev 13714)
+++ main/branches/prefix/pym/_emerge/ProgressHandler.py	2009-06-27 14:44:56 UTC (rev 13715)
@@ -1,3 +1,7 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
 import time
 class ProgressHandler(object):
 	def __init__(self):

Modified: main/branches/prefix/pym/_emerge/QueueScheduler.py
===================================================================
--- main/branches/prefix/pym/_emerge/QueueScheduler.py	2009-06-27 14:32:58 UTC (rev 13714)
+++ main/branches/prefix/pym/_emerge/QueueScheduler.py	2009-06-27 14:44:56 UTC (rev 13715)
@@ -1,3 +1,7 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
 from _emerge.PollScheduler import PollScheduler
 
 class QueueScheduler(PollScheduler):

Modified: main/branches/prefix/pym/_emerge/RepoDisplay.py
===================================================================
--- main/branches/prefix/pym/_emerge/RepoDisplay.py	2009-06-27 14:32:58 UTC (rev 13714)
+++ main/branches/prefix/pym/_emerge/RepoDisplay.py	2009-06-27 14:44:56 UTC (rev 13715)
@@ -1,3 +1,7 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
 from portage.output import teal
 import os
 class RepoDisplay(object):

Modified: main/branches/prefix/pym/_emerge/RootConfig.py
===================================================================
--- main/branches/prefix/pym/_emerge/RootConfig.py	2009-06-27 14:32:58 UTC (rev 13714)
+++ main/branches/prefix/pym/_emerge/RootConfig.py	2009-06-27 14:44:56 UTC (rev 13715)
@@ -1,3 +1,7 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
 from _emerge.PackageVirtualDbapi import PackageVirtualDbapi
 
 class RootConfig(object):

Modified: main/branches/prefix/pym/_emerge/Scheduler.py
===================================================================
--- main/branches/prefix/pym/_emerge/Scheduler.py	2009-06-27 14:32:58 UTC (rev 13714)
+++ main/branches/prefix/pym/_emerge/Scheduler.py	2009-06-27 14:44:56 UTC (rev 13715)
@@ -1,3 +1,7 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
 import logging
 import os
 import sys

Modified: main/branches/prefix/pym/_emerge/SequentialTaskQueue.py
===================================================================
--- main/branches/prefix/pym/_emerge/SequentialTaskQueue.py	2009-06-27 14:32:58 UTC (rev 13714)
+++ main/branches/prefix/pym/_emerge/SequentialTaskQueue.py	2009-06-27 14:44:56 UTC (rev 13715)
@@ -1,3 +1,7 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
 from _emerge.SlotObject import SlotObject
 from collections import deque
 class SequentialTaskQueue(SlotObject):

Modified: main/branches/prefix/pym/_emerge/SetArg.py
===================================================================
--- main/branches/prefix/pym/_emerge/SetArg.py	2009-06-27 14:32:58 UTC (rev 13714)
+++ main/branches/prefix/pym/_emerge/SetArg.py	2009-06-27 14:44:56 UTC (rev 13715)
@@ -1,3 +1,7 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
 from _emerge.DependencyArg import DependencyArg
 from portage.sets import SETPREFIX
 class SetArg(DependencyArg):

Modified: main/branches/prefix/pym/_emerge/SlotObject.py
===================================================================
--- main/branches/prefix/pym/_emerge/SlotObject.py	2009-06-27 14:32:58 UTC (rev 13714)
+++ main/branches/prefix/pym/_emerge/SlotObject.py	2009-06-27 14:44:56 UTC (rev 13715)
@@ -1,3 +1,7 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
 class SlotObject(object):
 	__slots__ = ("__weakref__",)
 

Modified: main/branches/prefix/pym/_emerge/SpawnProcess.py
===================================================================
--- main/branches/prefix/pym/_emerge/SpawnProcess.py	2009-06-27 14:32:58 UTC (rev 13714)
+++ main/branches/prefix/pym/_emerge/SpawnProcess.py	2009-06-27 14:44:56 UTC (rev 13715)
@@ -1,3 +1,7 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
 from _emerge.SubProcess import SubProcess
 from _emerge.PollConstants import PollConstants
 import sys

Modified: main/branches/prefix/pym/_emerge/SubProcess.py
===================================================================
--- main/branches/prefix/pym/_emerge/SubProcess.py	2009-06-27 14:32:58 UTC (rev 13714)
+++ main/branches/prefix/pym/_emerge/SubProcess.py	2009-06-27 14:44:56 UTC (rev 13715)
@@ -1,3 +1,7 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
 from _emerge.AbstractPollTask import AbstractPollTask
 import signal
 import os

Modified: main/branches/prefix/pym/_emerge/Task.py
===================================================================
--- main/branches/prefix/pym/_emerge/Task.py	2009-06-27 14:32:58 UTC (rev 13714)
+++ main/branches/prefix/pym/_emerge/Task.py	2009-06-27 14:44:56 UTC (rev 13715)
@@ -1,3 +1,7 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
 from _emerge.SlotObject import SlotObject
 class Task(SlotObject):
 	__slots__ = ("_hash_key", "_hash_value")

Modified: main/branches/prefix/pym/_emerge/TaskScheduler.py
===================================================================
--- main/branches/prefix/pym/_emerge/TaskScheduler.py	2009-06-27 14:32:58 UTC (rev 13714)
+++ main/branches/prefix/pym/_emerge/TaskScheduler.py	2009-06-27 14:44:56 UTC (rev 13715)
@@ -1,3 +1,7 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
 from _emerge.QueueScheduler import QueueScheduler
 from _emerge.SequentialTaskQueue import SequentialTaskQueue
 

Modified: main/branches/prefix/pym/_emerge/TaskSequence.py
===================================================================
--- main/branches/prefix/pym/_emerge/TaskSequence.py	2009-06-27 14:32:58 UTC (rev 13714)
+++ main/branches/prefix/pym/_emerge/TaskSequence.py	2009-06-27 14:44:56 UTC (rev 13715)
@@ -1,3 +1,7 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
 from _emerge.CompositeTask import CompositeTask
 from _emerge.AsynchronousTask import AsynchronousTask
 import os

Modified: main/branches/prefix/pym/_emerge/UninstallFailure.py
===================================================================
--- main/branches/prefix/pym/_emerge/UninstallFailure.py	2009-06-27 14:32:58 UTC (rev 13714)
+++ main/branches/prefix/pym/_emerge/UninstallFailure.py	2009-06-27 14:44:56 UTC (rev 13715)
@@ -1,3 +1,7 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
 # for an explanation on this logic, see pym/_emerge/__init__.py
 import os
 import sys

Modified: main/branches/prefix/pym/_emerge/UnmergeDepPriority.py
===================================================================
--- main/branches/prefix/pym/_emerge/UnmergeDepPriority.py	2009-06-27 14:32:58 UTC (rev 13714)
+++ main/branches/prefix/pym/_emerge/UnmergeDepPriority.py	2009-06-27 14:44:56 UTC (rev 13715)
@@ -1,3 +1,7 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
 from _emerge.AbstractDepPriority import AbstractDepPriority
 class UnmergeDepPriority(AbstractDepPriority):
 	__slots__ = ("optional", "satisfied",)

Modified: main/branches/prefix/pym/_emerge/UseFlagDisplay.py
===================================================================
--- main/branches/prefix/pym/_emerge/UseFlagDisplay.py	2009-06-27 14:32:58 UTC (rev 13714)
+++ main/branches/prefix/pym/_emerge/UseFlagDisplay.py	2009-06-27 14:44:56 UTC (rev 13715)
@@ -1,3 +1,7 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
 from portage.output import red
 from portage.util import cmp_sort_key
 from portage.output import blue

Modified: main/branches/prefix/pym/_emerge/__init__.py
===================================================================
--- main/branches/prefix/pym/_emerge/__init__.py	2009-06-27 14:32:58 UTC (rev 13714)
+++ main/branches/prefix/pym/_emerge/__init__.py	2009-06-27 14:44:56 UTC (rev 13715)
@@ -1,5 +1,4 @@
-#!@PORTAGE_PYTHON@ -O
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 

Modified: main/branches/prefix/pym/_emerge/_find_deep_system_runtime_deps.py
===================================================================
--- main/branches/prefix/pym/_emerge/_find_deep_system_runtime_deps.py	2009-06-27 14:32:58 UTC (rev 13714)
+++ main/branches/prefix/pym/_emerge/_find_deep_system_runtime_deps.py	2009-06-27 14:44:56 UTC (rev 13715)
@@ -1,3 +1,7 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
 from _emerge.DepPriority import DepPriority
 from _emerge.Package import Package
 

Modified: main/branches/prefix/pym/_emerge/_flush_elog_mod_echo.py
===================================================================
--- main/branches/prefix/pym/_emerge/_flush_elog_mod_echo.py	2009-06-27 14:32:58 UTC (rev 13714)
+++ main/branches/prefix/pym/_emerge/_flush_elog_mod_echo.py	2009-06-27 14:44:56 UTC (rev 13715)
@@ -1,3 +1,7 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
 def _flush_elog_mod_echo():
 	"""
 	Dump the mod_echo output now so that our other

Modified: main/branches/prefix/pym/_emerge/actions.py
===================================================================
--- main/branches/prefix/pym/_emerge/actions.py	2009-06-27 14:32:58 UTC (rev 13714)
+++ main/branches/prefix/pym/_emerge/actions.py	2009-06-27 14:44:56 UTC (rev 13715)
@@ -1,3 +1,7 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
 import commands
 import errno
 import logging

Modified: main/branches/prefix/pym/_emerge/changelog.py
===================================================================
--- main/branches/prefix/pym/_emerge/changelog.py	2009-06-27 14:32:58 UTC (rev 13714)
+++ main/branches/prefix/pym/_emerge/changelog.py	2009-06-27 14:44:56 UTC (rev 13715)
@@ -1,3 +1,7 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
 import os
 import re
 

Modified: main/branches/prefix/pym/_emerge/clear_caches.py
===================================================================
--- main/branches/prefix/pym/_emerge/clear_caches.py	2009-06-27 14:32:58 UTC (rev 13714)
+++ main/branches/prefix/pym/_emerge/clear_caches.py	2009-06-27 14:44:56 UTC (rev 13715)
@@ -1,3 +1,7 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
 import gc
 
 # for an explanation on this logic, see pym/_emerge/__init__.py

Modified: main/branches/prefix/pym/_emerge/countdown.py
===================================================================
--- main/branches/prefix/pym/_emerge/countdown.py	2009-06-27 14:32:58 UTC (rev 13714)
+++ main/branches/prefix/pym/_emerge/countdown.py	2009-06-27 14:44:56 UTC (rev 13715)
@@ -1,3 +1,7 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
 import sys
 import time
 

Modified: main/branches/prefix/pym/_emerge/create_depgraph_params.py
===================================================================
--- main/branches/prefix/pym/_emerge/create_depgraph_params.py	2009-06-27 14:32:58 UTC (rev 13714)
+++ main/branches/prefix/pym/_emerge/create_depgraph_params.py	2009-06-27 14:44:56 UTC (rev 13715)
@@ -1,3 +1,7 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
 def create_depgraph_params(myopts, myaction):
 	#configure emerge engine parameters
 	#

Modified: main/branches/prefix/pym/_emerge/create_world_atom.py
===================================================================
--- main/branches/prefix/pym/_emerge/create_world_atom.py	2009-06-27 14:32:58 UTC (rev 13714)
+++ main/branches/prefix/pym/_emerge/create_world_atom.py	2009-06-27 14:44:56 UTC (rev 13715)
@@ -1,3 +1,7 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
 # for an explanation on this logic, see pym/_emerge/__init__.py
 import os
 import sys

Modified: main/branches/prefix/pym/_emerge/depgraph.py
===================================================================
--- main/branches/prefix/pym/_emerge/depgraph.py	2009-06-27 14:32:58 UTC (rev 13714)
+++ main/branches/prefix/pym/_emerge/depgraph.py	2009-06-27 14:44:56 UTC (rev 13715)
@@ -1,3 +1,7 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
 import gc
 import os
 import re
@@ -1771,6 +1775,77 @@
 
 		print
 
+	def _iter_match_pkgs(self, root_config, pkg_type, atom, onlydeps=False):
+		"""
+		Iterate over Package instances of pkg_type matching the given atom.
+		This does not check visibility and it also does not match USE for
+		unbuilt ebuilds since USE are lazily calculated after visibility
+		checks (to avoid the expense when possible).
+		"""
+
+		db = root_config.trees[self.pkg_tree_map[pkg_type]].dbapi
+
+		if hasattr(db, "xmatch"):
+			cpv_list = db.xmatch("match-all", atom)
+		else:
+			cpv_list = db.match(atom)
+
+		# USE=multislot can make an installed package appear as if
+		# it doesn't satisfy a slot dependency. Rebuilding the ebuild
+		# won't do any good as long as USE=multislot is enabled since
+		# the newly built package still won't have the expected slot.
+		# Therefore, assume that such SLOT dependencies are already
+		# satisfied rather than forcing a rebuild.
+		installed = pkg_type == 'installed'
+		if installed and not cpv_list and atom.slot:
+			for cpv in db.match(atom.cp):
+				slot_available = False
+				for other_db, other_type, other_built, \
+					other_installed, other_keys in \
+					self._filtered_trees[root_config.root]["dbs"]:
+					try:
+						if atom.slot == \
+							other_db.aux_get(cpv, ["SLOT"])[0]:
+							slot_available = True
+							break
+					except KeyError:
+						pass
+				if not slot_available:
+					continue
+				inst_pkg = self._pkg(cpv, "installed",
+					root_config, installed=installed)
+				# Remove the slot from the atom and verify that
+				# the package matches the resulting atom.
+				atom_without_slot = portage.dep.remove_slot(atom)
+				if atom.use:
+					atom_without_slot += str(atom.use)
+				atom_without_slot = portage.dep.Atom(atom_without_slot)
+				if portage.match_from_list(
+					atom_without_slot, [inst_pkg]):
+					cpv_list = [inst_pkg.cpv]
+				break
+
+		if cpv_list:
+
+			# descending order
+			cpv_list.reverse()
+			for cpv in cpv_list:
+				try:
+					pkg = self._pkg(cpv, pkg_type, root_config,
+						installed=installed, onlydeps=onlydeps)
+				except portage.exception.PackageNotFound:
+					pass
+				else:
+					if pkg.cp != atom.cp:
+						# A cpv can be returned from dbapi.match() as an
+						# old-style virtual match even in cases when the
+						# package does not actually PROVIDE the virtual.
+						# Filter out any such false matches here.
+						if not InternalPackageSet(initial_atoms=(atom,)
+							).findAtomForPackage(pkg):
+							continue
+					yield pkg
+
 	def _select_pkg_highest_available(self, root, atom, onlydeps=False):
 		cache_key = (root, atom, onlydeps)
 		ret = self._highest_pkg_cache.get(cache_key)
@@ -1806,7 +1881,6 @@
 		if not isinstance(atom, portage.dep.Atom):
 			atom = portage.dep.Atom(atom)
 		atom_cp = atom.cp
-		atom_set = InternalPackageSet(initial_atoms=(atom,))
 		existing_node = None
 		myeb = None
 		usepkgonly = "--usepkgonly" in self.myopts
@@ -1837,63 +1911,18 @@
 						(found_available_arg and not selective)
 					if want_reinstall and matched_packages:
 						continue
-				if hasattr(db, "xmatch"):
-					cpv_list = db.xmatch("match-all", atom)
-				else:
-					cpv_list = db.match(atom)
 
-				# USE=multislot can make an installed package appear as if
-				# it doesn't satisfy a slot dependency. Rebuilding the ebuild
-				# won't do any good as long as USE=multislot is enabled since
-				# the newly built package still won't have the expected slot.
-				# Therefore, assume that such SLOT dependencies are already
-				# satisfied rather than forcing a rebuild.
-				if installed and not cpv_list and atom.slot:
-					for cpv in db.match(atom.cp):
-						slot_available = False
-						for other_db, other_type, other_built, \
-							other_installed, other_keys in dbs:
-							try:
-								if atom.slot == \
-									other_db.aux_get(cpv, ["SLOT"])[0]:
-									slot_available = True
-									break
-							except KeyError:
-								pass
-						if not slot_available:
-							continue
-						inst_pkg = self._pkg(cpv, "installed",
-							root_config, installed=installed)
-						# Remove the slot from the atom and verify that
-						# the package matches the resulting atom.
-						atom_without_slot = portage.dep.remove_slot(atom)
-						if atom.use:
-							atom_without_slot += str(atom.use)
-						atom_without_slot = portage.dep.Atom(atom_without_slot)
-						if portage.match_from_list(
-							atom_without_slot, [inst_pkg]):
-							cpv_list = [inst_pkg.cpv]
-						break
-
-				if not cpv_list:
-					continue
-
-				# descending order
-				cpv_list.reverse()
-				for cpv in cpv_list:
+				for pkg in self._iter_match_pkgs(root_config, pkg_type, atom, 
+					onlydeps=onlydeps):
+					cpv = pkg.cpv
 					# Make --noreplace take precedence over --newuse.
-					if not installed and noreplace and \
+					if not pkg.installed and noreplace and \
 						cpv in vardb.match(atom):
 						# If the installed version is masked, it may
 						# be necessary to look at lower versions,
 						# in case there is a visible downgrade.
 						continue
 					reinstall_for_flags = None
-					try:
-						pkg = self._pkg(cpv, pkg_type, root_config,
-							installed=installed, onlydeps=onlydeps)
-					except portage.exception.PackageNotFound:
-						continue
 
 					if not installed or (built and matched_packages):
 						# Only enforce visibility on installed packages
@@ -1948,14 +1977,6 @@
 					# expensive, so it is only performed lazily, after the
 					# above visibility checks are complete.
 
-					if pkg.cp != atom.cp:
-						# A cpv can be returned from dbapi.match() as an
-						# old-style virtual match even in cases when the
-						# package does not actually PROVIDE the virtual.
-						# Filter out any such false matches here.
-						if not atom_set.findAtomForPackage(pkg):
-							continue
-
 					myarg = None
 					if root == self.target_root:
 						try:

Modified: main/branches/prefix/pym/_emerge/emergelog.py
===================================================================
--- main/branches/prefix/pym/_emerge/emergelog.py	2009-06-27 14:32:58 UTC (rev 13714)
+++ main/branches/prefix/pym/_emerge/emergelog.py	2009-06-27 14:44:56 UTC (rev 13715)
@@ -1,3 +1,7 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
 import os
 import sys
 import time

Modified: main/branches/prefix/pym/_emerge/format_size.py
===================================================================
--- main/branches/prefix/pym/_emerge/format_size.py	2009-06-27 14:32:58 UTC (rev 13714)
+++ main/branches/prefix/pym/_emerge/format_size.py	2009-06-27 14:44:56 UTC (rev 13715)
@@ -1,3 +1,6 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
 
 # formats a size given in bytes nicely
 def format_size(mysize):

Modified: main/branches/prefix/pym/_emerge/getloadavg.py
===================================================================
--- main/branches/prefix/pym/_emerge/getloadavg.py	2009-06-27 14:32:58 UTC (rev 13714)
+++ main/branches/prefix/pym/_emerge/getloadavg.py	2009-06-27 14:44:56 UTC (rev 13715)
@@ -1,3 +1,7 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
 import os 
 
 getloadavg = getattr(os, "getloadavg", None)

Modified: main/branches/prefix/pym/_emerge/help.py
===================================================================
--- main/branches/prefix/pym/_emerge/help.py	2009-06-27 14:32:58 UTC (rev 13714)
+++ main/branches/prefix/pym/_emerge/help.py	2009-06-27 14:44:56 UTC (rev 13715)
@@ -1,4 +1,4 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 

Modified: main/branches/prefix/pym/_emerge/is_valid_package_atom.py
===================================================================
--- main/branches/prefix/pym/_emerge/is_valid_package_atom.py	2009-06-27 14:32:58 UTC (rev 13714)
+++ main/branches/prefix/pym/_emerge/is_valid_package_atom.py	2009-06-27 14:44:56 UTC (rev 13715)
@@ -1,3 +1,7 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
 import re
 
 # for an explanation on this logic, see pym/_emerge/__init__.py

Modified: main/branches/prefix/pym/_emerge/search.py
===================================================================
--- main/branches/prefix/pym/_emerge/search.py	2009-06-27 14:32:58 UTC (rev 13714)
+++ main/branches/prefix/pym/_emerge/search.py	2009-06-27 14:44:56 UTC (rev 13715)
@@ -1,3 +1,7 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
 import os
 import re
 from itertools import izip

Modified: main/branches/prefix/pym/_emerge/show_invalid_depstring_notice.py
===================================================================
--- main/branches/prefix/pym/_emerge/show_invalid_depstring_notice.py	2009-06-27 14:32:58 UTC (rev 13714)
+++ main/branches/prefix/pym/_emerge/show_invalid_depstring_notice.py	2009-06-27 14:44:56 UTC (rev 13715)
@@ -1,3 +1,7 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
 import logging
 import os
 import textwrap

Modified: main/branches/prefix/pym/_emerge/stdout_spinner.py
===================================================================
--- main/branches/prefix/pym/_emerge/stdout_spinner.py	2009-06-27 14:32:58 UTC (rev 13714)
+++ main/branches/prefix/pym/_emerge/stdout_spinner.py	2009-06-27 14:44:56 UTC (rev 13715)
@@ -1,3 +1,7 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
 import platform
 import sys
 import time

Modified: main/branches/prefix/pym/_emerge/unmerge.py
===================================================================
--- main/branches/prefix/pym/_emerge/unmerge.py	2009-06-27 14:32:58 UTC (rev 13714)
+++ main/branches/prefix/pym/_emerge/unmerge.py	2009-06-27 14:44:56 UTC (rev 13715)
@@ -1,3 +1,7 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
 import logging
 import os
 import sys

Modified: main/branches/prefix/pym/_emerge/userquery.py
===================================================================
--- main/branches/prefix/pym/_emerge/userquery.py	2009-06-27 14:32:58 UTC (rev 13714)
+++ main/branches/prefix/pym/_emerge/userquery.py	2009-06-27 14:44:56 UTC (rev 13715)
@@ -1,3 +1,7 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
 import sys
 
 from portage.output import bold, create_color_func

Modified: main/branches/prefix/pym/_emerge/visible.py
===================================================================
--- main/branches/prefix/pym/_emerge/visible.py	2009-06-27 14:32:58 UTC (rev 13714)
+++ main/branches/prefix/pym/_emerge/visible.py	2009-06-27 14:44:56 UTC (rev 13715)
@@ -1,3 +1,7 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
 # for an explanation on this logic, see pym/_emerge/__init__.py
 import os
 import sys




^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2009-06-27 14:45 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-06-27 14:44 [gentoo-commits] portage r13715 - main/branches/prefix/pym/_emerge Fabian Groffen (grobian)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox