| 1 |
Author: grobian |
| 2 |
Date: 2009-06-27 14:44:56 +0000 (Sat, 27 Jun 2009) |
| 3 |
New Revision: 13715 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/branches/prefix/pym/_emerge/AbstractDepPriority.py |
| 7 |
main/branches/prefix/pym/_emerge/AbstractPollTask.py |
| 8 |
main/branches/prefix/pym/_emerge/AsynchronousTask.py |
| 9 |
main/branches/prefix/pym/_emerge/AtomArg.py |
| 10 |
main/branches/prefix/pym/_emerge/Binpkg.py |
| 11 |
main/branches/prefix/pym/_emerge/BinpkgExtractorAsync.py |
| 12 |
main/branches/prefix/pym/_emerge/BinpkgFetcher.py |
| 13 |
main/branches/prefix/pym/_emerge/BinpkgPrefetcher.py |
| 14 |
main/branches/prefix/pym/_emerge/BinpkgVerifier.py |
| 15 |
main/branches/prefix/pym/_emerge/Blocker.py |
| 16 |
main/branches/prefix/pym/_emerge/BlockerCache.py |
| 17 |
main/branches/prefix/pym/_emerge/BlockerDB.py |
| 18 |
main/branches/prefix/pym/_emerge/BlockerDepPriority.py |
| 19 |
main/branches/prefix/pym/_emerge/CompositeTask.py |
| 20 |
main/branches/prefix/pym/_emerge/DepPriority.py |
| 21 |
main/branches/prefix/pym/_emerge/DepPriorityNormalRange.py |
| 22 |
main/branches/prefix/pym/_emerge/DepPrioritySatisfiedRange.py |
| 23 |
main/branches/prefix/pym/_emerge/Dependency.py |
| 24 |
main/branches/prefix/pym/_emerge/DependencyArg.py |
| 25 |
main/branches/prefix/pym/_emerge/EbuildBinpkg.py |
| 26 |
main/branches/prefix/pym/_emerge/EbuildBuild.py |
| 27 |
main/branches/prefix/pym/_emerge/EbuildBuildDir.py |
| 28 |
main/branches/prefix/pym/_emerge/EbuildExecuter.py |
| 29 |
main/branches/prefix/pym/_emerge/EbuildFetcher.py |
| 30 |
main/branches/prefix/pym/_emerge/EbuildFetchonly.py |
| 31 |
main/branches/prefix/pym/_emerge/EbuildMerge.py |
| 32 |
main/branches/prefix/pym/_emerge/EbuildMetadataPhase.py |
| 33 |
main/branches/prefix/pym/_emerge/EbuildPhase.py |
| 34 |
main/branches/prefix/pym/_emerge/EbuildProcess.py |
| 35 |
main/branches/prefix/pym/_emerge/FakeVartree.py |
| 36 |
main/branches/prefix/pym/_emerge/JobStatusDisplay.py |
| 37 |
main/branches/prefix/pym/_emerge/MergeListItem.py |
| 38 |
main/branches/prefix/pym/_emerge/MetadataRegen.py |
| 39 |
main/branches/prefix/pym/_emerge/MiscFunctionsProcess.py |
| 40 |
main/branches/prefix/pym/_emerge/Package.py |
| 41 |
main/branches/prefix/pym/_emerge/PackageArg.py |
| 42 |
main/branches/prefix/pym/_emerge/PackageCounters.py |
| 43 |
main/branches/prefix/pym/_emerge/PackageMerge.py |
| 44 |
main/branches/prefix/pym/_emerge/PackageUninstall.py |
| 45 |
main/branches/prefix/pym/_emerge/PackageVirtualDbapi.py |
| 46 |
main/branches/prefix/pym/_emerge/PipeReader.py |
| 47 |
main/branches/prefix/pym/_emerge/PollConstants.py |
| 48 |
main/branches/prefix/pym/_emerge/PollScheduler.py |
| 49 |
main/branches/prefix/pym/_emerge/PollSelectAdapter.py |
| 50 |
main/branches/prefix/pym/_emerge/ProgressHandler.py |
| 51 |
main/branches/prefix/pym/_emerge/QueueScheduler.py |
| 52 |
main/branches/prefix/pym/_emerge/RepoDisplay.py |
| 53 |
main/branches/prefix/pym/_emerge/RootConfig.py |
| 54 |
main/branches/prefix/pym/_emerge/Scheduler.py |
| 55 |
main/branches/prefix/pym/_emerge/SequentialTaskQueue.py |
| 56 |
main/branches/prefix/pym/_emerge/SetArg.py |
| 57 |
main/branches/prefix/pym/_emerge/SlotObject.py |
| 58 |
main/branches/prefix/pym/_emerge/SpawnProcess.py |
| 59 |
main/branches/prefix/pym/_emerge/SubProcess.py |
| 60 |
main/branches/prefix/pym/_emerge/Task.py |
| 61 |
main/branches/prefix/pym/_emerge/TaskScheduler.py |
| 62 |
main/branches/prefix/pym/_emerge/TaskSequence.py |
| 63 |
main/branches/prefix/pym/_emerge/UninstallFailure.py |
| 64 |
main/branches/prefix/pym/_emerge/UnmergeDepPriority.py |
| 65 |
main/branches/prefix/pym/_emerge/UseFlagDisplay.py |
| 66 |
main/branches/prefix/pym/_emerge/__init__.py |
| 67 |
main/branches/prefix/pym/_emerge/_find_deep_system_runtime_deps.py |
| 68 |
main/branches/prefix/pym/_emerge/_flush_elog_mod_echo.py |
| 69 |
main/branches/prefix/pym/_emerge/actions.py |
| 70 |
main/branches/prefix/pym/_emerge/changelog.py |
| 71 |
main/branches/prefix/pym/_emerge/clear_caches.py |
| 72 |
main/branches/prefix/pym/_emerge/countdown.py |
| 73 |
main/branches/prefix/pym/_emerge/create_depgraph_params.py |
| 74 |
main/branches/prefix/pym/_emerge/create_world_atom.py |
| 75 |
main/branches/prefix/pym/_emerge/depgraph.py |
| 76 |
main/branches/prefix/pym/_emerge/emergelog.py |
| 77 |
main/branches/prefix/pym/_emerge/format_size.py |
| 78 |
main/branches/prefix/pym/_emerge/getloadavg.py |
| 79 |
main/branches/prefix/pym/_emerge/help.py |
| 80 |
main/branches/prefix/pym/_emerge/is_valid_package_atom.py |
| 81 |
main/branches/prefix/pym/_emerge/search.py |
| 82 |
main/branches/prefix/pym/_emerge/show_invalid_depstring_notice.py |
| 83 |
main/branches/prefix/pym/_emerge/stdout_spinner.py |
| 84 |
main/branches/prefix/pym/_emerge/unmerge.py |
| 85 |
main/branches/prefix/pym/_emerge/userquery.py |
| 86 |
main/branches/prefix/pym/_emerge/visible.py |
| 87 |
Log: |
| 88 |
Merged from trunk -r13688:13690 |
| 89 |
|
| 90 |
| 13689 | Split out a depgraph._iter_match_pkgs() method from | |
| 91 |
| zmedico | _select_pkg_highest_available_imp(). | |
| 92 |
|
| 93 |
| 13690 | Add/update copyright headers. | |
| 94 |
| zmedico | | |
| 95 |
|
| 96 |
|
| 97 |
Modified: main/branches/prefix/pym/_emerge/AbstractDepPriority.py |
| 98 |
=================================================================== |
| 99 |
--- main/branches/prefix/pym/_emerge/AbstractDepPriority.py 2009-06-27 14:32:58 UTC (rev 13714) |
| 100 |
+++ main/branches/prefix/pym/_emerge/AbstractDepPriority.py 2009-06-27 14:44:56 UTC (rev 13715) |
| 101 |
@@ -1,3 +1,7 @@ |
| 102 |
+# Copyright 1999-2009 Gentoo Foundation |
| 103 |
+# Distributed under the terms of the GNU General Public License v2 |
| 104 |
+# $Id$ |
| 105 |
+ |
| 106 |
from _emerge.SlotObject import SlotObject |
| 107 |
class AbstractDepPriority(SlotObject): |
| 108 |
__slots__ = ("buildtime", "runtime", "runtime_post") |
| 109 |
|
| 110 |
Modified: main/branches/prefix/pym/_emerge/AbstractPollTask.py |
| 111 |
=================================================================== |
| 112 |
--- main/branches/prefix/pym/_emerge/AbstractPollTask.py 2009-06-27 14:32:58 UTC (rev 13714) |
| 113 |
+++ main/branches/prefix/pym/_emerge/AbstractPollTask.py 2009-06-27 14:44:56 UTC (rev 13715) |
| 114 |
@@ -1,3 +1,7 @@ |
| 115 |
+# Copyright 1999-2009 Gentoo Foundation |
| 116 |
+# Distributed under the terms of the GNU General Public License v2 |
| 117 |
+# $Id$ |
| 118 |
+ |
| 119 |
from _emerge.AsynchronousTask import AsynchronousTask |
| 120 |
from _emerge.PollConstants import PollConstants |
| 121 |
class AbstractPollTask(AsynchronousTask): |
| 122 |
|
| 123 |
Modified: main/branches/prefix/pym/_emerge/AsynchronousTask.py |
| 124 |
=================================================================== |
| 125 |
--- main/branches/prefix/pym/_emerge/AsynchronousTask.py 2009-06-27 14:32:58 UTC (rev 13714) |
| 126 |
+++ main/branches/prefix/pym/_emerge/AsynchronousTask.py 2009-06-27 14:44:56 UTC (rev 13715) |
| 127 |
@@ -1,3 +1,7 @@ |
| 128 |
+# Copyright 1999-2009 Gentoo Foundation |
| 129 |
+# Distributed under the terms of the GNU General Public License v2 |
| 130 |
+# $Id$ |
| 131 |
+ |
| 132 |
from _emerge.SlotObject import SlotObject |
| 133 |
class AsynchronousTask(SlotObject): |
| 134 |
""" |
| 135 |
|
| 136 |
Modified: main/branches/prefix/pym/_emerge/AtomArg.py |
| 137 |
=================================================================== |
| 138 |
--- main/branches/prefix/pym/_emerge/AtomArg.py 2009-06-27 14:32:58 UTC (rev 13714) |
| 139 |
+++ main/branches/prefix/pym/_emerge/AtomArg.py 2009-06-27 14:44:56 UTC (rev 13715) |
| 140 |
@@ -1,3 +1,7 @@ |
| 141 |
+# Copyright 1999-2009 Gentoo Foundation |
| 142 |
+# Distributed under the terms of the GNU General Public License v2 |
| 143 |
+# $Id$ |
| 144 |
+ |
| 145 |
from _emerge.DependencyArg import DependencyArg |
| 146 |
|
| 147 |
# for an explanation on this logic, see pym/_emerge/__init__.py |
| 148 |
|
| 149 |
Modified: main/branches/prefix/pym/_emerge/Binpkg.py |
| 150 |
=================================================================== |
| 151 |
--- main/branches/prefix/pym/_emerge/Binpkg.py 2009-06-27 14:32:58 UTC (rev 13714) |
| 152 |
+++ main/branches/prefix/pym/_emerge/Binpkg.py 2009-06-27 14:44:56 UTC (rev 13715) |
| 153 |
@@ -1,3 +1,7 @@ |
| 154 |
+# Copyright 1999-2009 Gentoo Foundation |
| 155 |
+# Distributed under the terms of the GNU General Public License v2 |
| 156 |
+# $Id$ |
| 157 |
+ |
| 158 |
from _emerge.EbuildPhase import EbuildPhase |
| 159 |
from _emerge.BinpkgFetcher import BinpkgFetcher |
| 160 |
from _emerge.BinpkgExtractorAsync import BinpkgExtractorAsync |
| 161 |
|
| 162 |
Modified: main/branches/prefix/pym/_emerge/BinpkgExtractorAsync.py |
| 163 |
=================================================================== |
| 164 |
--- main/branches/prefix/pym/_emerge/BinpkgExtractorAsync.py 2009-06-27 14:32:58 UTC (rev 13714) |
| 165 |
+++ main/branches/prefix/pym/_emerge/BinpkgExtractorAsync.py 2009-06-27 14:44:56 UTC (rev 13715) |
| 166 |
@@ -1,3 +1,7 @@ |
| 167 |
+# Copyright 1999-2009 Gentoo Foundation |
| 168 |
+# Distributed under the terms of the GNU General Public License v2 |
| 169 |
+# $Id$ |
| 170 |
+ |
| 171 |
from _emerge.SpawnProcess import SpawnProcess |
| 172 |
# for an explanation on this logic, see pym/_emerge/__init__.py |
| 173 |
import os |
| 174 |
|
| 175 |
Modified: main/branches/prefix/pym/_emerge/BinpkgFetcher.py |
| 176 |
=================================================================== |
| 177 |
--- main/branches/prefix/pym/_emerge/BinpkgFetcher.py 2009-06-27 14:32:58 UTC (rev 13714) |
| 178 |
+++ main/branches/prefix/pym/_emerge/BinpkgFetcher.py 2009-06-27 14:44:56 UTC (rev 13715) |
| 179 |
@@ -1,3 +1,7 @@ |
| 180 |
+# Copyright 1999-2009 Gentoo Foundation |
| 181 |
+# Distributed under the terms of the GNU General Public License v2 |
| 182 |
+# $Id$ |
| 183 |
+ |
| 184 |
from _emerge.SpawnProcess import SpawnProcess |
| 185 |
import urlparse |
| 186 |
import sys |
| 187 |
|
| 188 |
Modified: main/branches/prefix/pym/_emerge/BinpkgPrefetcher.py |
| 189 |
=================================================================== |
| 190 |
--- main/branches/prefix/pym/_emerge/BinpkgPrefetcher.py 2009-06-27 14:32:58 UTC (rev 13714) |
| 191 |
+++ main/branches/prefix/pym/_emerge/BinpkgPrefetcher.py 2009-06-27 14:44:56 UTC (rev 13715) |
| 192 |
@@ -1,3 +1,7 @@ |
| 193 |
+# Copyright 1999-2009 Gentoo Foundation |
| 194 |
+# Distributed under the terms of the GNU General Public License v2 |
| 195 |
+# $Id$ |
| 196 |
+ |
| 197 |
from _emerge.BinpkgFetcher import BinpkgFetcher |
| 198 |
from _emerge.CompositeTask import CompositeTask |
| 199 |
from _emerge.BinpkgVerifier import BinpkgVerifier |
| 200 |
|
| 201 |
Modified: main/branches/prefix/pym/_emerge/BinpkgVerifier.py |
| 202 |
=================================================================== |
| 203 |
--- main/branches/prefix/pym/_emerge/BinpkgVerifier.py 2009-06-27 14:32:58 UTC (rev 13714) |
| 204 |
+++ main/branches/prefix/pym/_emerge/BinpkgVerifier.py 2009-06-27 14:44:56 UTC (rev 13715) |
| 205 |
@@ -1,3 +1,7 @@ |
| 206 |
+# Copyright 1999-2009 Gentoo Foundation |
| 207 |
+# Distributed under the terms of the GNU General Public License v2 |
| 208 |
+# $Id$ |
| 209 |
+ |
| 210 |
from _emerge.AsynchronousTask import AsynchronousTask |
| 211 |
from portage.util import writemsg |
| 212 |
import sys |
| 213 |
|
| 214 |
Modified: main/branches/prefix/pym/_emerge/Blocker.py |
| 215 |
=================================================================== |
| 216 |
--- main/branches/prefix/pym/_emerge/Blocker.py 2009-06-27 14:32:58 UTC (rev 13714) |
| 217 |
+++ main/branches/prefix/pym/_emerge/Blocker.py 2009-06-27 14:44:56 UTC (rev 13715) |
| 218 |
@@ -1,3 +1,7 @@ |
| 219 |
+# Copyright 1999-2009 Gentoo Foundation |
| 220 |
+# Distributed under the terms of the GNU General Public License v2 |
| 221 |
+# $Id$ |
| 222 |
+ |
| 223 |
from _emerge.Task import Task |
| 224 |
# for an explanation on this logic, see pym/_emerge/__init__.py |
| 225 |
import os |
| 226 |
|
| 227 |
Modified: main/branches/prefix/pym/_emerge/BlockerCache.py |
| 228 |
=================================================================== |
| 229 |
--- main/branches/prefix/pym/_emerge/BlockerCache.py 2009-06-27 14:32:58 UTC (rev 13714) |
| 230 |
+++ main/branches/prefix/pym/_emerge/BlockerCache.py 2009-06-27 14:44:56 UTC (rev 13715) |
| 231 |
@@ -1,3 +1,7 @@ |
| 232 |
+# Copyright 1999-2009 Gentoo Foundation |
| 233 |
+# Distributed under the terms of the GNU General Public License v2 |
| 234 |
+# $Id$ |
| 235 |
+ |
| 236 |
from portage.util import writemsg |
| 237 |
from portage.data import secpass |
| 238 |
# for an explanation on this logic, see pym/_emerge/__init__.py |
| 239 |
|
| 240 |
Modified: main/branches/prefix/pym/_emerge/BlockerDB.py |
| 241 |
=================================================================== |
| 242 |
--- main/branches/prefix/pym/_emerge/BlockerDB.py 2009-06-27 14:32:58 UTC (rev 13714) |
| 243 |
+++ main/branches/prefix/pym/_emerge/BlockerDB.py 2009-06-27 14:44:56 UTC (rev 13715) |
| 244 |
@@ -1,3 +1,7 @@ |
| 245 |
+# Copyright 1999-2009 Gentoo Foundation |
| 246 |
+# Distributed under the terms of the GNU General Public License v2 |
| 247 |
+# $Id$ |
| 248 |
+ |
| 249 |
# for an explanation on this logic, see pym/_emerge/__init__.py |
| 250 |
import os |
| 251 |
import sys |
| 252 |
|
| 253 |
Modified: main/branches/prefix/pym/_emerge/BlockerDepPriority.py |
| 254 |
=================================================================== |
| 255 |
--- main/branches/prefix/pym/_emerge/BlockerDepPriority.py 2009-06-27 14:32:58 UTC (rev 13714) |
| 256 |
+++ main/branches/prefix/pym/_emerge/BlockerDepPriority.py 2009-06-27 14:44:56 UTC (rev 13715) |
| 257 |
@@ -1,3 +1,7 @@ |
| 258 |
+# Copyright 1999-2009 Gentoo Foundation |
| 259 |
+# Distributed under the terms of the GNU General Public License v2 |
| 260 |
+# $Id$ |
| 261 |
+ |
| 262 |
from _emerge.DepPriority import DepPriority |
| 263 |
class BlockerDepPriority(DepPriority): |
| 264 |
__slots__ = () |
| 265 |
|
| 266 |
Modified: main/branches/prefix/pym/_emerge/CompositeTask.py |
| 267 |
=================================================================== |
| 268 |
--- main/branches/prefix/pym/_emerge/CompositeTask.py 2009-06-27 14:32:58 UTC (rev 13714) |
| 269 |
+++ main/branches/prefix/pym/_emerge/CompositeTask.py 2009-06-27 14:44:56 UTC (rev 13715) |
| 270 |
@@ -1,3 +1,7 @@ |
| 271 |
+# Copyright 1999-2009 Gentoo Foundation |
| 272 |
+# Distributed under the terms of the GNU General Public License v2 |
| 273 |
+# $Id$ |
| 274 |
+ |
| 275 |
from _emerge.AsynchronousTask import AsynchronousTask |
| 276 |
import os |
| 277 |
class CompositeTask(AsynchronousTask): |
| 278 |
|
| 279 |
Modified: main/branches/prefix/pym/_emerge/DepPriority.py |
| 280 |
=================================================================== |
| 281 |
--- main/branches/prefix/pym/_emerge/DepPriority.py 2009-06-27 14:32:58 UTC (rev 13714) |
| 282 |
+++ main/branches/prefix/pym/_emerge/DepPriority.py 2009-06-27 14:44:56 UTC (rev 13715) |
| 283 |
@@ -1,3 +1,7 @@ |
| 284 |
+# Copyright 1999-2009 Gentoo Foundation |
| 285 |
+# Distributed under the terms of the GNU General Public License v2 |
| 286 |
+# $Id$ |
| 287 |
+ |
| 288 |
from _emerge.AbstractDepPriority import AbstractDepPriority |
| 289 |
class DepPriority(AbstractDepPriority): |
| 290 |
|
| 291 |
|
| 292 |
Modified: main/branches/prefix/pym/_emerge/DepPriorityNormalRange.py |
| 293 |
=================================================================== |
| 294 |
--- main/branches/prefix/pym/_emerge/DepPriorityNormalRange.py 2009-06-27 14:32:58 UTC (rev 13714) |
| 295 |
+++ main/branches/prefix/pym/_emerge/DepPriorityNormalRange.py 2009-06-27 14:44:56 UTC (rev 13715) |
| 296 |
@@ -1,3 +1,7 @@ |
| 297 |
+# Copyright 1999-2009 Gentoo Foundation |
| 298 |
+# Distributed under the terms of the GNU General Public License v2 |
| 299 |
+# $Id$ |
| 300 |
+ |
| 301 |
from _emerge.DepPriority import DepPriority |
| 302 |
class DepPriorityNormalRange(object): |
| 303 |
""" |
| 304 |
|
| 305 |
Modified: main/branches/prefix/pym/_emerge/DepPrioritySatisfiedRange.py |
| 306 |
=================================================================== |
| 307 |
--- main/branches/prefix/pym/_emerge/DepPrioritySatisfiedRange.py 2009-06-27 14:32:58 UTC (rev 13714) |
| 308 |
+++ main/branches/prefix/pym/_emerge/DepPrioritySatisfiedRange.py 2009-06-27 14:44:56 UTC (rev 13715) |
| 309 |
@@ -1,3 +1,7 @@ |
| 310 |
+# Copyright 1999-2009 Gentoo Foundation |
| 311 |
+# Distributed under the terms of the GNU General Public License v2 |
| 312 |
+# $Id$ |
| 313 |
+ |
| 314 |
from _emerge.DepPriority import DepPriority |
| 315 |
class DepPrioritySatisfiedRange(object): |
| 316 |
""" |
| 317 |
|
| 318 |
Modified: main/branches/prefix/pym/_emerge/Dependency.py |
| 319 |
=================================================================== |
| 320 |
--- main/branches/prefix/pym/_emerge/Dependency.py 2009-06-27 14:32:58 UTC (rev 13714) |
| 321 |
+++ main/branches/prefix/pym/_emerge/Dependency.py 2009-06-27 14:44:56 UTC (rev 13715) |
| 322 |
@@ -1,3 +1,7 @@ |
| 323 |
+# Copyright 1999-2009 Gentoo Foundation |
| 324 |
+# Distributed under the terms of the GNU General Public License v2 |
| 325 |
+# $Id$ |
| 326 |
+ |
| 327 |
from _emerge.DepPriority import DepPriority |
| 328 |
from _emerge.SlotObject import SlotObject |
| 329 |
class Dependency(SlotObject): |
| 330 |
|
| 331 |
Modified: main/branches/prefix/pym/_emerge/DependencyArg.py |
| 332 |
=================================================================== |
| 333 |
--- main/branches/prefix/pym/_emerge/DependencyArg.py 2009-06-27 14:32:58 UTC (rev 13714) |
| 334 |
+++ main/branches/prefix/pym/_emerge/DependencyArg.py 2009-06-27 14:44:56 UTC (rev 13715) |
| 335 |
@@ -1,3 +1,7 @@ |
| 336 |
+# Copyright 1999-2009 Gentoo Foundation |
| 337 |
+# Distributed under the terms of the GNU General Public License v2 |
| 338 |
+# $Id$ |
| 339 |
+ |
| 340 |
class DependencyArg(object): |
| 341 |
def __init__(self, arg=None, root_config=None): |
| 342 |
self.arg = arg |
| 343 |
|
| 344 |
Modified: main/branches/prefix/pym/_emerge/EbuildBinpkg.py |
| 345 |
=================================================================== |
| 346 |
--- main/branches/prefix/pym/_emerge/EbuildBinpkg.py 2009-06-27 14:32:58 UTC (rev 13714) |
| 347 |
+++ main/branches/prefix/pym/_emerge/EbuildBinpkg.py 2009-06-27 14:44:56 UTC (rev 13715) |
| 348 |
@@ -1,3 +1,7 @@ |
| 349 |
+# Copyright 1999-2009 Gentoo Foundation |
| 350 |
+# Distributed under the terms of the GNU General Public License v2 |
| 351 |
+# $Id$ |
| 352 |
+ |
| 353 |
from _emerge.EbuildProcess import EbuildProcess |
| 354 |
import os |
| 355 |
class EbuildBinpkg(EbuildProcess): |
| 356 |
|
| 357 |
Modified: main/branches/prefix/pym/_emerge/EbuildBuild.py |
| 358 |
=================================================================== |
| 359 |
--- main/branches/prefix/pym/_emerge/EbuildBuild.py 2009-06-27 14:32:58 UTC (rev 13714) |
| 360 |
+++ main/branches/prefix/pym/_emerge/EbuildBuild.py 2009-06-27 14:44:56 UTC (rev 13715) |
| 361 |
@@ -1,3 +1,7 @@ |
| 362 |
+# Copyright 1999-2009 Gentoo Foundation |
| 363 |
+# Distributed under the terms of the GNU General Public License v2 |
| 364 |
+# $Id$ |
| 365 |
+ |
| 366 |
from _emerge.EbuildExecuter import EbuildExecuter |
| 367 |
from _emerge.EbuildPhase import EbuildPhase |
| 368 |
from _emerge.EbuildBinpkg import EbuildBinpkg |
| 369 |
|
| 370 |
Modified: main/branches/prefix/pym/_emerge/EbuildBuildDir.py |
| 371 |
=================================================================== |
| 372 |
--- main/branches/prefix/pym/_emerge/EbuildBuildDir.py 2009-06-27 14:32:58 UTC (rev 13714) |
| 373 |
+++ main/branches/prefix/pym/_emerge/EbuildBuildDir.py 2009-06-27 14:44:56 UTC (rev 13715) |
| 374 |
@@ -1,3 +1,7 @@ |
| 375 |
+# Copyright 1999-2009 Gentoo Foundation |
| 376 |
+# Distributed under the terms of the GNU General Public License v2 |
| 377 |
+# $Id$ |
| 378 |
+ |
| 379 |
from _emerge.SlotObject import SlotObject |
| 380 |
# for an explanation on this logic, see pym/_emerge/__init__.py |
| 381 |
import os |
| 382 |
|
| 383 |
Modified: main/branches/prefix/pym/_emerge/EbuildExecuter.py |
| 384 |
=================================================================== |
| 385 |
--- main/branches/prefix/pym/_emerge/EbuildExecuter.py 2009-06-27 14:32:58 UTC (rev 13714) |
| 386 |
+++ main/branches/prefix/pym/_emerge/EbuildExecuter.py 2009-06-27 14:44:56 UTC (rev 13715) |
| 387 |
@@ -1,3 +1,7 @@ |
| 388 |
+# Copyright 1999-2009 Gentoo Foundation |
| 389 |
+# Distributed under the terms of the GNU General Public License v2 |
| 390 |
+# $Id$ |
| 391 |
+ |
| 392 |
from _emerge.EbuildPhase import EbuildPhase |
| 393 |
from _emerge.TaskSequence import TaskSequence |
| 394 |
from _emerge.CompositeTask import CompositeTask |
| 395 |
|
| 396 |
Modified: main/branches/prefix/pym/_emerge/EbuildFetcher.py |
| 397 |
=================================================================== |
| 398 |
--- main/branches/prefix/pym/_emerge/EbuildFetcher.py 2009-06-27 14:32:58 UTC (rev 13714) |
| 399 |
+++ main/branches/prefix/pym/_emerge/EbuildFetcher.py 2009-06-27 14:44:56 UTC (rev 13715) |
| 400 |
@@ -1,3 +1,7 @@ |
| 401 |
+# Copyright 1999-2009 Gentoo Foundation |
| 402 |
+# Distributed under the terms of the GNU General Public License v2 |
| 403 |
+# $Id$ |
| 404 |
+ |
| 405 |
from _emerge.SpawnProcess import SpawnProcess |
| 406 |
from _emerge.EbuildBuildDir import EbuildBuildDir |
| 407 |
# for an explanation on this logic, see pym/_emerge/__init__.py |
| 408 |
|
| 409 |
Modified: main/branches/prefix/pym/_emerge/EbuildFetchonly.py |
| 410 |
=================================================================== |
| 411 |
--- main/branches/prefix/pym/_emerge/EbuildFetchonly.py 2009-06-27 14:32:58 UTC (rev 13714) |
| 412 |
+++ main/branches/prefix/pym/_emerge/EbuildFetchonly.py 2009-06-27 14:44:56 UTC (rev 13715) |
| 413 |
@@ -1,3 +1,7 @@ |
| 414 |
+# Copyright 1999-2009 Gentoo Foundation |
| 415 |
+# Distributed under the terms of the GNU General Public License v2 |
| 416 |
+# $Id$ |
| 417 |
+ |
| 418 |
from _emerge.SlotObject import SlotObject |
| 419 |
import shutil |
| 420 |
# for an explanation on this logic, see pym/_emerge/__init__.py |
| 421 |
|
| 422 |
Modified: main/branches/prefix/pym/_emerge/EbuildMerge.py |
| 423 |
=================================================================== |
| 424 |
--- main/branches/prefix/pym/_emerge/EbuildMerge.py 2009-06-27 14:32:58 UTC (rev 13714) |
| 425 |
+++ main/branches/prefix/pym/_emerge/EbuildMerge.py 2009-06-27 14:44:56 UTC (rev 13715) |
| 426 |
@@ -1,3 +1,7 @@ |
| 427 |
+# Copyright 1999-2009 Gentoo Foundation |
| 428 |
+# Distributed under the terms of the GNU General Public License v2 |
| 429 |
+# $Id$ |
| 430 |
+ |
| 431 |
from _emerge.SlotObject import SlotObject |
| 432 |
# for an explanation on this logic, see pym/_emerge/__init__.py |
| 433 |
import os |
| 434 |
|
| 435 |
Modified: main/branches/prefix/pym/_emerge/EbuildMetadataPhase.py |
| 436 |
=================================================================== |
| 437 |
--- main/branches/prefix/pym/_emerge/EbuildMetadataPhase.py 2009-06-27 14:32:58 UTC (rev 13714) |
| 438 |
+++ main/branches/prefix/pym/_emerge/EbuildMetadataPhase.py 2009-06-27 14:44:56 UTC (rev 13715) |
| 439 |
@@ -1,3 +1,7 @@ |
| 440 |
+# Copyright 1999-2009 Gentoo Foundation |
| 441 |
+# Distributed under the terms of the GNU General Public License v2 |
| 442 |
+# $Id$ |
| 443 |
+ |
| 444 |
from _emerge.SubProcess import SubProcess |
| 445 |
from _emerge.PollConstants import PollConstants |
| 446 |
import sys |
| 447 |
|
| 448 |
Modified: main/branches/prefix/pym/_emerge/EbuildPhase.py |
| 449 |
=================================================================== |
| 450 |
--- main/branches/prefix/pym/_emerge/EbuildPhase.py 2009-06-27 14:32:58 UTC (rev 13714) |
| 451 |
+++ main/branches/prefix/pym/_emerge/EbuildPhase.py 2009-06-27 14:44:56 UTC (rev 13715) |
| 452 |
@@ -1,3 +1,7 @@ |
| 453 |
+# Copyright 1999-2009 Gentoo Foundation |
| 454 |
+# Distributed under the terms of the GNU General Public License v2 |
| 455 |
+# $Id$ |
| 456 |
+ |
| 457 |
from _emerge.MiscFunctionsProcess import MiscFunctionsProcess |
| 458 |
from _emerge.EbuildProcess import EbuildProcess |
| 459 |
from _emerge.CompositeTask import CompositeTask |
| 460 |
|
| 461 |
Modified: main/branches/prefix/pym/_emerge/EbuildProcess.py |
| 462 |
=================================================================== |
| 463 |
--- main/branches/prefix/pym/_emerge/EbuildProcess.py 2009-06-27 14:32:58 UTC (rev 13714) |
| 464 |
+++ main/branches/prefix/pym/_emerge/EbuildProcess.py 2009-06-27 14:44:56 UTC (rev 13715) |
| 465 |
@@ -1,3 +1,7 @@ |
| 466 |
+# Copyright 1999-2009 Gentoo Foundation |
| 467 |
+# Distributed under the terms of the GNU General Public License v2 |
| 468 |
+# $Id$ |
| 469 |
+ |
| 470 |
from _emerge.SpawnProcess import SpawnProcess |
| 471 |
# for an explanation on this logic, see pym/_emerge/__init__.py |
| 472 |
import os |
| 473 |
|
| 474 |
Modified: main/branches/prefix/pym/_emerge/FakeVartree.py |
| 475 |
=================================================================== |
| 476 |
--- main/branches/prefix/pym/_emerge/FakeVartree.py 2009-06-27 14:32:58 UTC (rev 13714) |
| 477 |
+++ main/branches/prefix/pym/_emerge/FakeVartree.py 2009-06-27 14:44:56 UTC (rev 13715) |
| 478 |
@@ -1,3 +1,7 @@ |
| 479 |
+# Copyright 1999-2009 Gentoo Foundation |
| 480 |
+# Distributed under the terms of the GNU General Public License v2 |
| 481 |
+# $Id$ |
| 482 |
+ |
| 483 |
import os |
| 484 |
from itertools import izip |
| 485 |
|
| 486 |
|
| 487 |
Modified: main/branches/prefix/pym/_emerge/JobStatusDisplay.py |
| 488 |
=================================================================== |
| 489 |
--- main/branches/prefix/pym/_emerge/JobStatusDisplay.py 2009-06-27 14:32:58 UTC (rev 13714) |
| 490 |
+++ main/branches/prefix/pym/_emerge/JobStatusDisplay.py 2009-06-27 14:44:56 UTC (rev 13715) |
| 491 |
@@ -1,3 +1,7 @@ |
| 492 |
+# Copyright 1999-2009 Gentoo Foundation |
| 493 |
+# Distributed under the terms of the GNU General Public License v2 |
| 494 |
+# $Id$ |
| 495 |
+ |
| 496 |
import formatter |
| 497 |
import os |
| 498 |
import sys |
| 499 |
|
| 500 |
Modified: main/branches/prefix/pym/_emerge/MergeListItem.py |
| 501 |
=================================================================== |
| 502 |
--- main/branches/prefix/pym/_emerge/MergeListItem.py 2009-06-27 14:32:58 UTC (rev 13714) |
| 503 |
+++ main/branches/prefix/pym/_emerge/MergeListItem.py 2009-06-27 14:44:56 UTC (rev 13715) |
| 504 |
@@ -1,3 +1,7 @@ |
| 505 |
+# Copyright 1999-2009 Gentoo Foundation |
| 506 |
+# Distributed under the terms of the GNU General Public License v2 |
| 507 |
+# $Id$ |
| 508 |
+ |
| 509 |
import os |
| 510 |
|
| 511 |
from portage.output import colorize |
| 512 |
|
| 513 |
Modified: main/branches/prefix/pym/_emerge/MetadataRegen.py |
| 514 |
=================================================================== |
| 515 |
--- main/branches/prefix/pym/_emerge/MetadataRegen.py 2009-06-27 14:32:58 UTC (rev 13714) |
| 516 |
+++ main/branches/prefix/pym/_emerge/MetadataRegen.py 2009-06-27 14:44:56 UTC (rev 13715) |
| 517 |
@@ -1,3 +1,7 @@ |
| 518 |
+# Copyright 1999-2009 Gentoo Foundation |
| 519 |
+# Distributed under the terms of the GNU General Public License v2 |
| 520 |
+# $Id$ |
| 521 |
+ |
| 522 |
# for an explanation on this logic, see pym/_emerge/__init__.py |
| 523 |
import os |
| 524 |
import sys |
| 525 |
|
| 526 |
Modified: main/branches/prefix/pym/_emerge/MiscFunctionsProcess.py |
| 527 |
=================================================================== |
| 528 |
--- main/branches/prefix/pym/_emerge/MiscFunctionsProcess.py 2009-06-27 14:32:58 UTC (rev 13714) |
| 529 |
+++ main/branches/prefix/pym/_emerge/MiscFunctionsProcess.py 2009-06-27 14:44:56 UTC (rev 13715) |
| 530 |
@@ -1,3 +1,7 @@ |
| 531 |
+# Copyright 1999-2009 Gentoo Foundation |
| 532 |
+# Distributed under the terms of the GNU General Public License v2 |
| 533 |
+# $Id$ |
| 534 |
+ |
| 535 |
from _emerge.SpawnProcess import SpawnProcess |
| 536 |
# for an explanation on this logic, see pym/_emerge/__init__.py |
| 537 |
import os |
| 538 |
|
| 539 |
Modified: main/branches/prefix/pym/_emerge/Package.py |
| 540 |
=================================================================== |
| 541 |
--- main/branches/prefix/pym/_emerge/Package.py 2009-06-27 14:32:58 UTC (rev 13714) |
| 542 |
+++ main/branches/prefix/pym/_emerge/Package.py 2009-06-27 14:44:56 UTC (rev 13715) |
| 543 |
@@ -1,3 +1,7 @@ |
| 544 |
+# Copyright 1999-2009 Gentoo Foundation |
| 545 |
+# Distributed under the terms of the GNU General Public License v2 |
| 546 |
+# $Id$ |
| 547 |
+ |
| 548 |
import re |
| 549 |
from itertools import chain |
| 550 |
|
| 551 |
|
| 552 |
Modified: main/branches/prefix/pym/_emerge/PackageArg.py |
| 553 |
=================================================================== |
| 554 |
--- main/branches/prefix/pym/_emerge/PackageArg.py 2009-06-27 14:32:58 UTC (rev 13714) |
| 555 |
+++ main/branches/prefix/pym/_emerge/PackageArg.py 2009-06-27 14:44:56 UTC (rev 13715) |
| 556 |
@@ -1,3 +1,7 @@ |
| 557 |
+# Copyright 1999-2009 Gentoo Foundation |
| 558 |
+# Distributed under the terms of the GNU General Public License v2 |
| 559 |
+# $Id$ |
| 560 |
+ |
| 561 |
from _emerge.DependencyArg import DependencyArg |
| 562 |
# for an explanation on this logic, see pym/_emerge/__init__.py |
| 563 |
import os |
| 564 |
|
| 565 |
Modified: main/branches/prefix/pym/_emerge/PackageCounters.py |
| 566 |
=================================================================== |
| 567 |
--- main/branches/prefix/pym/_emerge/PackageCounters.py 2009-06-27 14:32:58 UTC (rev 13714) |
| 568 |
+++ main/branches/prefix/pym/_emerge/PackageCounters.py 2009-06-27 14:44:56 UTC (rev 13715) |
| 569 |
@@ -1,3 +1,7 @@ |
| 570 |
+# Copyright 1999-2009 Gentoo Foundation |
| 571 |
+# Distributed under the terms of the GNU General Public License v2 |
| 572 |
+# $Id$ |
| 573 |
+ |
| 574 |
from portage.output import colorize, create_color_func |
| 575 |
bad = create_color_func("BAD") |
| 576 |
|
| 577 |
|
| 578 |
Modified: main/branches/prefix/pym/_emerge/PackageMerge.py |
| 579 |
=================================================================== |
| 580 |
--- main/branches/prefix/pym/_emerge/PackageMerge.py 2009-06-27 14:32:58 UTC (rev 13714) |
| 581 |
+++ main/branches/prefix/pym/_emerge/PackageMerge.py 2009-06-27 14:44:56 UTC (rev 13715) |
| 582 |
@@ -1,3 +1,7 @@ |
| 583 |
+# Copyright 1999-2009 Gentoo Foundation |
| 584 |
+# Distributed under the terms of the GNU General Public License v2 |
| 585 |
+# $Id$ |
| 586 |
+ |
| 587 |
from _emerge.AsynchronousTask import AsynchronousTask |
| 588 |
from portage.output import colorize |
| 589 |
class PackageMerge(AsynchronousTask): |
| 590 |
|
| 591 |
Modified: main/branches/prefix/pym/_emerge/PackageUninstall.py |
| 592 |
=================================================================== |
| 593 |
--- main/branches/prefix/pym/_emerge/PackageUninstall.py 2009-06-27 14:32:58 UTC (rev 13714) |
| 594 |
+++ main/branches/prefix/pym/_emerge/PackageUninstall.py 2009-06-27 14:44:56 UTC (rev 13715) |
| 595 |
@@ -1,3 +1,7 @@ |
| 596 |
+# Copyright 1999-2009 Gentoo Foundation |
| 597 |
+# Distributed under the terms of the GNU General Public License v2 |
| 598 |
+# $Id$ |
| 599 |
+ |
| 600 |
import logging |
| 601 |
# for an explanation on this logic, see pym/_emerge/__init__.py |
| 602 |
import os |
| 603 |
|
| 604 |
Modified: main/branches/prefix/pym/_emerge/PackageVirtualDbapi.py |
| 605 |
=================================================================== |
| 606 |
--- main/branches/prefix/pym/_emerge/PackageVirtualDbapi.py 2009-06-27 14:32:58 UTC (rev 13714) |
| 607 |
+++ main/branches/prefix/pym/_emerge/PackageVirtualDbapi.py 2009-06-27 14:44:56 UTC (rev 13715) |
| 608 |
@@ -1,3 +1,7 @@ |
| 609 |
+# Copyright 1999-2009 Gentoo Foundation |
| 610 |
+# Distributed under the terms of the GNU General Public License v2 |
| 611 |
+# $Id$ |
| 612 |
+ |
| 613 |
# for an explanation on this logic, see pym/_emerge/__init__.py |
| 614 |
import os |
| 615 |
import sys |
| 616 |
|
| 617 |
Modified: main/branches/prefix/pym/_emerge/PipeReader.py |
| 618 |
=================================================================== |
| 619 |
--- main/branches/prefix/pym/_emerge/PipeReader.py 2009-06-27 14:32:58 UTC (rev 13714) |
| 620 |
+++ main/branches/prefix/pym/_emerge/PipeReader.py 2009-06-27 14:44:56 UTC (rev 13715) |
| 621 |
@@ -1,3 +1,7 @@ |
| 622 |
+# Copyright 1999-2009 Gentoo Foundation |
| 623 |
+# Distributed under the terms of the GNU General Public License v2 |
| 624 |
+# $Id$ |
| 625 |
+ |
| 626 |
from _emerge.AbstractPollTask import AbstractPollTask |
| 627 |
from _emerge.PollConstants import PollConstants |
| 628 |
import sys |
| 629 |
|
| 630 |
Modified: main/branches/prefix/pym/_emerge/PollConstants.py |
| 631 |
=================================================================== |
| 632 |
--- main/branches/prefix/pym/_emerge/PollConstants.py 2009-06-27 14:32:58 UTC (rev 13714) |
| 633 |
+++ main/branches/prefix/pym/_emerge/PollConstants.py 2009-06-27 14:44:56 UTC (rev 13715) |
| 634 |
@@ -1,3 +1,7 @@ |
| 635 |
+# Copyright 1999-2009 Gentoo Foundation |
| 636 |
+# Distributed under the terms of the GNU General Public License v2 |
| 637 |
+# $Id$ |
| 638 |
+ |
| 639 |
import select |
| 640 |
class PollConstants(object): |
| 641 |
|
| 642 |
|
| 643 |
Modified: main/branches/prefix/pym/_emerge/PollScheduler.py |
| 644 |
=================================================================== |
| 645 |
--- main/branches/prefix/pym/_emerge/PollScheduler.py 2009-06-27 14:32:58 UTC (rev 13714) |
| 646 |
+++ main/branches/prefix/pym/_emerge/PollScheduler.py 2009-06-27 14:44:56 UTC (rev 13715) |
| 647 |
@@ -1,3 +1,7 @@ |
| 648 |
+# Copyright 1999-2009 Gentoo Foundation |
| 649 |
+# Distributed under the terms of the GNU General Public License v2 |
| 650 |
+# $Id$ |
| 651 |
+ |
| 652 |
import logging |
| 653 |
import select |
| 654 |
|
| 655 |
|
| 656 |
Modified: main/branches/prefix/pym/_emerge/PollSelectAdapter.py |
| 657 |
=================================================================== |
| 658 |
--- main/branches/prefix/pym/_emerge/PollSelectAdapter.py 2009-06-27 14:32:58 UTC (rev 13714) |
| 659 |
+++ main/branches/prefix/pym/_emerge/PollSelectAdapter.py 2009-06-27 14:44:56 UTC (rev 13715) |
| 660 |
@@ -1,3 +1,7 @@ |
| 661 |
+# Copyright 1999-2009 Gentoo Foundation |
| 662 |
+# Distributed under the terms of the GNU General Public License v2 |
| 663 |
+# $Id$ |
| 664 |
+ |
| 665 |
from _emerge.PollConstants import PollConstants |
| 666 |
import select |
| 667 |
class PollSelectAdapter(PollConstants): |
| 668 |
|
| 669 |
Modified: main/branches/prefix/pym/_emerge/ProgressHandler.py |
| 670 |
=================================================================== |
| 671 |
--- main/branches/prefix/pym/_emerge/ProgressHandler.py 2009-06-27 14:32:58 UTC (rev 13714) |
| 672 |
+++ main/branches/prefix/pym/_emerge/ProgressHandler.py 2009-06-27 14:44:56 UTC (rev 13715) |
| 673 |
@@ -1,3 +1,7 @@ |
| 674 |
+# Copyright 1999-2009 Gentoo Foundation |
| 675 |
+# Distributed under the terms of the GNU General Public License v2 |
| 676 |
+# $Id$ |
| 677 |
+ |
| 678 |
import time |
| 679 |
class ProgressHandler(object): |
| 680 |
def __init__(self): |
| 681 |
|
| 682 |
Modified: main/branches/prefix/pym/_emerge/QueueScheduler.py |
| 683 |
=================================================================== |
| 684 |
--- main/branches/prefix/pym/_emerge/QueueScheduler.py 2009-06-27 14:32:58 UTC (rev 13714) |
| 685 |
+++ main/branches/prefix/pym/_emerge/QueueScheduler.py 2009-06-27 14:44:56 UTC (rev 13715) |
| 686 |
@@ -1,3 +1,7 @@ |
| 687 |
+# Copyright 1999-2009 Gentoo Foundation |
| 688 |
+# Distributed under the terms of the GNU General Public License v2 |
| 689 |
+# $Id$ |
| 690 |
+ |
| 691 |
from _emerge.PollScheduler import PollScheduler |
| 692 |
|
| 693 |
class QueueScheduler(PollScheduler): |
| 694 |
|
| 695 |
Modified: main/branches/prefix/pym/_emerge/RepoDisplay.py |
| 696 |
=================================================================== |
| 697 |
--- main/branches/prefix/pym/_emerge/RepoDisplay.py 2009-06-27 14:32:58 UTC (rev 13714) |
| 698 |
+++ main/branches/prefix/pym/_emerge/RepoDisplay.py 2009-06-27 14:44:56 UTC (rev 13715) |
| 699 |
@@ -1,3 +1,7 @@ |
| 700 |
+# Copyright 1999-2009 Gentoo Foundation |
| 701 |
+# Distributed under the terms of the GNU General Public License v2 |
| 702 |
+# $Id$ |
| 703 |
+ |
| 704 |
from portage.output import teal |
| 705 |
import os |
| 706 |
class RepoDisplay(object): |
| 707 |
|
| 708 |
Modified: main/branches/prefix/pym/_emerge/RootConfig.py |
| 709 |
=================================================================== |
| 710 |
--- main/branches/prefix/pym/_emerge/RootConfig.py 2009-06-27 14:32:58 UTC (rev 13714) |
| 711 |
+++ main/branches/prefix/pym/_emerge/RootConfig.py 2009-06-27 14:44:56 UTC (rev 13715) |
| 712 |
@@ -1,3 +1,7 @@ |
| 713 |
+# Copyright 1999-2009 Gentoo Foundation |
| 714 |
+# Distributed under the terms of the GNU General Public License v2 |
| 715 |
+# $Id$ |
| 716 |
+ |
| 717 |
from _emerge.PackageVirtualDbapi import PackageVirtualDbapi |
| 718 |
|
| 719 |
class RootConfig(object): |
| 720 |
|
| 721 |
Modified: main/branches/prefix/pym/_emerge/Scheduler.py |
| 722 |
=================================================================== |
| 723 |
--- main/branches/prefix/pym/_emerge/Scheduler.py 2009-06-27 14:32:58 UTC (rev 13714) |
| 724 |
+++ main/branches/prefix/pym/_emerge/Scheduler.py 2009-06-27 14:44:56 UTC (rev 13715) |
| 725 |
@@ -1,3 +1,7 @@ |
| 726 |
+# Copyright 1999-2009 Gentoo Foundation |
| 727 |
+# Distributed under the terms of the GNU General Public License v2 |
| 728 |
+# $Id$ |
| 729 |
+ |
| 730 |
import logging |
| 731 |
import os |
| 732 |
import sys |
| 733 |
|
| 734 |
Modified: main/branches/prefix/pym/_emerge/SequentialTaskQueue.py |
| 735 |
=================================================================== |
| 736 |
--- main/branches/prefix/pym/_emerge/SequentialTaskQueue.py 2009-06-27 14:32:58 UTC (rev 13714) |
| 737 |
+++ main/branches/prefix/pym/_emerge/SequentialTaskQueue.py 2009-06-27 14:44:56 UTC (rev 13715) |
| 738 |
@@ -1,3 +1,7 @@ |
| 739 |
+# Copyright 1999-2009 Gentoo Foundation |
| 740 |
+# Distributed under the terms of the GNU General Public License v2 |
| 741 |
+# $Id$ |
| 742 |
+ |
| 743 |
from _emerge.SlotObject import SlotObject |
| 744 |
from collections import deque |
| 745 |
class SequentialTaskQueue(SlotObject): |
| 746 |
|
| 747 |
Modified: main/branches/prefix/pym/_emerge/SetArg.py |
| 748 |
=================================================================== |
| 749 |
--- main/branches/prefix/pym/_emerge/SetArg.py 2009-06-27 14:32:58 UTC (rev 13714) |
| 750 |
+++ main/branches/prefix/pym/_emerge/SetArg.py 2009-06-27 14:44:56 UTC (rev 13715) |
| 751 |
@@ -1,3 +1,7 @@ |
| 752 |
+# Copyright 1999-2009 Gentoo Foundation |
| 753 |
+# Distributed under the terms of the GNU General Public License v2 |
| 754 |
+# $Id$ |
| 755 |
+ |
| 756 |
from _emerge.DependencyArg import DependencyArg |
| 757 |
from portage.sets import SETPREFIX |
| 758 |
class SetArg(DependencyArg): |
| 759 |
|
| 760 |
Modified: main/branches/prefix/pym/_emerge/SlotObject.py |
| 761 |
=================================================================== |
| 762 |
--- main/branches/prefix/pym/_emerge/SlotObject.py 2009-06-27 14:32:58 UTC (rev 13714) |
| 763 |
+++ main/branches/prefix/pym/_emerge/SlotObject.py 2009-06-27 14:44:56 UTC (rev 13715) |
| 764 |
@@ -1,3 +1,7 @@ |
| 765 |
+# Copyright 1999-2009 Gentoo Foundation |
| 766 |
+# Distributed under the terms of the GNU General Public License v2 |
| 767 |
+# $Id$ |
| 768 |
+ |
| 769 |
class SlotObject(object): |
| 770 |
__slots__ = ("__weakref__",) |
| 771 |
|
| 772 |
|
| 773 |
Modified: main/branches/prefix/pym/_emerge/SpawnProcess.py |
| 774 |
=================================================================== |
| 775 |
--- main/branches/prefix/pym/_emerge/SpawnProcess.py 2009-06-27 14:32:58 UTC (rev 13714) |
| 776 |
+++ main/branches/prefix/pym/_emerge/SpawnProcess.py 2009-06-27 14:44:56 UTC (rev 13715) |
| 777 |
@@ -1,3 +1,7 @@ |
| 778 |
+# Copyright 1999-2009 Gentoo Foundation |
| 779 |
+# Distributed under the terms of the GNU General Public License v2 |
| 780 |
+# $Id$ |
| 781 |
+ |
| 782 |
from _emerge.SubProcess import SubProcess |
| 783 |
from _emerge.PollConstants import PollConstants |
| 784 |
import sys |
| 785 |
|
| 786 |
Modified: main/branches/prefix/pym/_emerge/SubProcess.py |
| 787 |
=================================================================== |
| 788 |
--- main/branches/prefix/pym/_emerge/SubProcess.py 2009-06-27 14:32:58 UTC (rev 13714) |
| 789 |
+++ main/branches/prefix/pym/_emerge/SubProcess.py 2009-06-27 14:44:56 UTC (rev 13715) |
| 790 |
@@ -1,3 +1,7 @@ |
| 791 |
+# Copyright 1999-2009 Gentoo Foundation |
| 792 |
+# Distributed under the terms of the GNU General Public License v2 |
| 793 |
+# $Id$ |
| 794 |
+ |
| 795 |
from _emerge.AbstractPollTask import AbstractPollTask |
| 796 |
import signal |
| 797 |
import os |
| 798 |
|
| 799 |
Modified: main/branches/prefix/pym/_emerge/Task.py |
| 800 |
=================================================================== |
| 801 |
--- main/branches/prefix/pym/_emerge/Task.py 2009-06-27 14:32:58 UTC (rev 13714) |
| 802 |
+++ main/branches/prefix/pym/_emerge/Task.py 2009-06-27 14:44:56 UTC (rev 13715) |
| 803 |
@@ -1,3 +1,7 @@ |
| 804 |
+# Copyright 1999-2009 Gentoo Foundation |
| 805 |
+# Distributed under the terms of the GNU General Public License v2 |
| 806 |
+# $Id$ |
| 807 |
+ |
| 808 |
from _emerge.SlotObject import SlotObject |
| 809 |
class Task(SlotObject): |
| 810 |
__slots__ = ("_hash_key", "_hash_value") |
| 811 |
|
| 812 |
Modified: main/branches/prefix/pym/_emerge/TaskScheduler.py |
| 813 |
=================================================================== |
| 814 |
--- main/branches/prefix/pym/_emerge/TaskScheduler.py 2009-06-27 14:32:58 UTC (rev 13714) |
| 815 |
+++ main/branches/prefix/pym/_emerge/TaskScheduler.py 2009-06-27 14:44:56 UTC (rev 13715) |
| 816 |
@@ -1,3 +1,7 @@ |
| 817 |
+# Copyright 1999-2009 Gentoo Foundation |
| 818 |
+# Distributed under the terms of the GNU General Public License v2 |
| 819 |
+# $Id$ |
| 820 |
+ |
| 821 |
from _emerge.QueueScheduler import QueueScheduler |
| 822 |
from _emerge.SequentialTaskQueue import SequentialTaskQueue |
| 823 |
|
| 824 |
|
| 825 |
Modified: main/branches/prefix/pym/_emerge/TaskSequence.py |
| 826 |
=================================================================== |
| 827 |
--- main/branches/prefix/pym/_emerge/TaskSequence.py 2009-06-27 14:32:58 UTC (rev 13714) |
| 828 |
+++ main/branches/prefix/pym/_emerge/TaskSequence.py 2009-06-27 14:44:56 UTC (rev 13715) |
| 829 |
@@ -1,3 +1,7 @@ |
| 830 |
+# Copyright 1999-2009 Gentoo Foundation |
| 831 |
+# Distributed under the terms of the GNU General Public License v2 |
| 832 |
+# $Id$ |
| 833 |
+ |
| 834 |
from _emerge.CompositeTask import CompositeTask |
| 835 |
from _emerge.AsynchronousTask import AsynchronousTask |
| 836 |
import os |
| 837 |
|
| 838 |
Modified: main/branches/prefix/pym/_emerge/UninstallFailure.py |
| 839 |
=================================================================== |
| 840 |
--- main/branches/prefix/pym/_emerge/UninstallFailure.py 2009-06-27 14:32:58 UTC (rev 13714) |
| 841 |
+++ main/branches/prefix/pym/_emerge/UninstallFailure.py 2009-06-27 14:44:56 UTC (rev 13715) |
| 842 |
@@ -1,3 +1,7 @@ |
| 843 |
+# Copyright 1999-2009 Gentoo Foundation |
| 844 |
+# Distributed under the terms of the GNU General Public License v2 |
| 845 |
+# $Id$ |
| 846 |
+ |
| 847 |
# for an explanation on this logic, see pym/_emerge/__init__.py |
| 848 |
import os |
| 849 |
import sys |
| 850 |
|
| 851 |
Modified: main/branches/prefix/pym/_emerge/UnmergeDepPriority.py |
| 852 |
=================================================================== |
| 853 |
--- main/branches/prefix/pym/_emerge/UnmergeDepPriority.py 2009-06-27 14:32:58 UTC (rev 13714) |
| 854 |
+++ main/branches/prefix/pym/_emerge/UnmergeDepPriority.py 2009-06-27 14:44:56 UTC (rev 13715) |
| 855 |
@@ -1,3 +1,7 @@ |
| 856 |
+# Copyright 1999-2009 Gentoo Foundation |
| 857 |
+# Distributed under the terms of the GNU General Public License v2 |
| 858 |
+# $Id$ |
| 859 |
+ |
| 860 |
from _emerge.AbstractDepPriority import AbstractDepPriority |
| 861 |
class UnmergeDepPriority(AbstractDepPriority): |
| 862 |
__slots__ = ("optional", "satisfied",) |
| 863 |
|
| 864 |
Modified: main/branches/prefix/pym/_emerge/UseFlagDisplay.py |
| 865 |
=================================================================== |
| 866 |
--- main/branches/prefix/pym/_emerge/UseFlagDisplay.py 2009-06-27 14:32:58 UTC (rev 13714) |
| 867 |
+++ main/branches/prefix/pym/_emerge/UseFlagDisplay.py 2009-06-27 14:44:56 UTC (rev 13715) |
| 868 |
@@ -1,3 +1,7 @@ |
| 869 |
+# Copyright 1999-2009 Gentoo Foundation |
| 870 |
+# Distributed under the terms of the GNU General Public License v2 |
| 871 |
+# $Id$ |
| 872 |
+ |
| 873 |
from portage.output import red |
| 874 |
from portage.util import cmp_sort_key |
| 875 |
from portage.output import blue |
| 876 |
|
| 877 |
Modified: main/branches/prefix/pym/_emerge/__init__.py |
| 878 |
=================================================================== |
| 879 |
--- main/branches/prefix/pym/_emerge/__init__.py 2009-06-27 14:32:58 UTC (rev 13714) |
| 880 |
+++ main/branches/prefix/pym/_emerge/__init__.py 2009-06-27 14:44:56 UTC (rev 13715) |
| 881 |
@@ -1,5 +1,4 @@ |
| 882 |
-#!@PORTAGE_PYTHON@ -O |
| 883 |
-# Copyright 1999-2006 Gentoo Foundation |
| 884 |
+# Copyright 1999-2009 Gentoo Foundation |
| 885 |
# Distributed under the terms of the GNU General Public License v2 |
| 886 |
# $Id$ |
| 887 |
|
| 888 |
|
| 889 |
Modified: main/branches/prefix/pym/_emerge/_find_deep_system_runtime_deps.py |
| 890 |
=================================================================== |
| 891 |
--- main/branches/prefix/pym/_emerge/_find_deep_system_runtime_deps.py 2009-06-27 14:32:58 UTC (rev 13714) |
| 892 |
+++ main/branches/prefix/pym/_emerge/_find_deep_system_runtime_deps.py 2009-06-27 14:44:56 UTC (rev 13715) |
| 893 |
@@ -1,3 +1,7 @@ |
| 894 |
+# Copyright 1999-2009 Gentoo Foundation |
| 895 |
+# Distributed under the terms of the GNU General Public License v2 |
| 896 |
+# $Id$ |
| 897 |
+ |
| 898 |
from _emerge.DepPriority import DepPriority |
| 899 |
from _emerge.Package import Package |
| 900 |
|
| 901 |
|
| 902 |
Modified: main/branches/prefix/pym/_emerge/_flush_elog_mod_echo.py |
| 903 |
=================================================================== |
| 904 |
--- main/branches/prefix/pym/_emerge/_flush_elog_mod_echo.py 2009-06-27 14:32:58 UTC (rev 13714) |
| 905 |
+++ main/branches/prefix/pym/_emerge/_flush_elog_mod_echo.py 2009-06-27 14:44:56 UTC (rev 13715) |
| 906 |
@@ -1,3 +1,7 @@ |
| 907 |
+# Copyright 1999-2009 Gentoo Foundation |
| 908 |
+# Distributed under the terms of the GNU General Public License v2 |
| 909 |
+# $Id$ |
| 910 |
+ |
| 911 |
def _flush_elog_mod_echo(): |
| 912 |
""" |
| 913 |
Dump the mod_echo output now so that our other |
| 914 |
|
| 915 |
Modified: main/branches/prefix/pym/_emerge/actions.py |
| 916 |
=================================================================== |
| 917 |
--- main/branches/prefix/pym/_emerge/actions.py 2009-06-27 14:32:58 UTC (rev 13714) |
| 918 |
+++ main/branches/prefix/pym/_emerge/actions.py 2009-06-27 14:44:56 UTC (rev 13715) |
| 919 |
@@ -1,3 +1,7 @@ |
| 920 |
+# Copyright 1999-2009 Gentoo Foundation |
| 921 |
+# Distributed under the terms of the GNU General Public License v2 |
| 922 |
+# $Id$ |
| 923 |
+ |
| 924 |
import commands |
| 925 |
import errno |
| 926 |
import logging |
| 927 |
|
| 928 |
Modified: main/branches/prefix/pym/_emerge/changelog.py |
| 929 |
=================================================================== |
| 930 |
--- main/branches/prefix/pym/_emerge/changelog.py 2009-06-27 14:32:58 UTC (rev 13714) |
| 931 |
+++ main/branches/prefix/pym/_emerge/changelog.py 2009-06-27 14:44:56 UTC (rev 13715) |
| 932 |
@@ -1,3 +1,7 @@ |
| 933 |
+# Copyright 1999-2009 Gentoo Foundation |
| 934 |
+# Distributed under the terms of the GNU General Public License v2 |
| 935 |
+# $Id$ |
| 936 |
+ |
| 937 |
import os |
| 938 |
import re |
| 939 |
|
| 940 |
|
| 941 |
Modified: main/branches/prefix/pym/_emerge/clear_caches.py |
| 942 |
=================================================================== |
| 943 |
--- main/branches/prefix/pym/_emerge/clear_caches.py 2009-06-27 14:32:58 UTC (rev 13714) |
| 944 |
+++ main/branches/prefix/pym/_emerge/clear_caches.py 2009-06-27 14:44:56 UTC (rev 13715) |
| 945 |
@@ -1,3 +1,7 @@ |
| 946 |
+# Copyright 1999-2009 Gentoo Foundation |
| 947 |
+# Distributed under the terms of the GNU General Public License v2 |
| 948 |
+# $Id$ |
| 949 |
+ |
| 950 |
import gc |
| 951 |
|
| 952 |
# for an explanation on this logic, see pym/_emerge/__init__.py |
| 953 |
|
| 954 |
Modified: main/branches/prefix/pym/_emerge/countdown.py |
| 955 |
=================================================================== |
| 956 |
--- main/branches/prefix/pym/_emerge/countdown.py 2009-06-27 14:32:58 UTC (rev 13714) |
| 957 |
+++ main/branches/prefix/pym/_emerge/countdown.py 2009-06-27 14:44:56 UTC (rev 13715) |
| 958 |
@@ -1,3 +1,7 @@ |
| 959 |
+# Copyright 1999-2009 Gentoo Foundation |
| 960 |
+# Distributed under the terms of the GNU General Public License v2 |
| 961 |
+# $Id$ |
| 962 |
+ |
| 963 |
import sys |
| 964 |
import time |
| 965 |
|
| 966 |
|
| 967 |
Modified: main/branches/prefix/pym/_emerge/create_depgraph_params.py |
| 968 |
=================================================================== |
| 969 |
--- main/branches/prefix/pym/_emerge/create_depgraph_params.py 2009-06-27 14:32:58 UTC (rev 13714) |
| 970 |
+++ main/branches/prefix/pym/_emerge/create_depgraph_params.py 2009-06-27 14:44:56 UTC (rev 13715) |
| 971 |
@@ -1,3 +1,7 @@ |
| 972 |
+# Copyright 1999-2009 Gentoo Foundation |
| 973 |
+# Distributed under the terms of the GNU General Public License v2 |
| 974 |
+# $Id$ |
| 975 |
+ |
| 976 |
def create_depgraph_params(myopts, myaction): |
| 977 |
#configure emerge engine parameters |
| 978 |
# |
| 979 |
|
| 980 |
Modified: main/branches/prefix/pym/_emerge/create_world_atom.py |
| 981 |
=================================================================== |
| 982 |
--- main/branches/prefix/pym/_emerge/create_world_atom.py 2009-06-27 14:32:58 UTC (rev 13714) |
| 983 |
+++ main/branches/prefix/pym/_emerge/create_world_atom.py 2009-06-27 14:44:56 UTC (rev 13715) |
| 984 |
@@ -1,3 +1,7 @@ |
| 985 |
+# Copyright 1999-2009 Gentoo Foundation |
| 986 |
+# Distributed under the terms of the GNU General Public License v2 |
| 987 |
+# $Id$ |
| 988 |
+ |
| 989 |
# for an explanation on this logic, see pym/_emerge/__init__.py |
| 990 |
import os |
| 991 |
import sys |
| 992 |
|
| 993 |
Modified: main/branches/prefix/pym/_emerge/depgraph.py |
| 994 |
=================================================================== |
| 995 |
--- main/branches/prefix/pym/_emerge/depgraph.py 2009-06-27 14:32:58 UTC (rev 13714) |
| 996 |
+++ main/branches/prefix/pym/_emerge/depgraph.py 2009-06-27 14:44:56 UTC (rev 13715) |
| 997 |
@@ -1,3 +1,7 @@ |
| 998 |
+# Copyright 1999-2009 Gentoo Foundation |
| 999 |
+# Distributed under the terms of the GNU General Public License v2 |
| 1000 |
+# $Id$ |
| 1001 |
+ |
| 1002 |
import gc |
| 1003 |
import os |
| 1004 |
import re |
| 1005 |
@@ -1771,6 +1775,77 @@ |
| 1006 |
|
| 1007 |
print |
| 1008 |
|
| 1009 |
+ def _iter_match_pkgs(self, root_config, pkg_type, atom, onlydeps=False): |
| 1010 |
+ """ |
| 1011 |
+ Iterate over Package instances of pkg_type matching the given atom. |
| 1012 |
+ This does not check visibility and it also does not match USE for |
| 1013 |
+ unbuilt ebuilds since USE are lazily calculated after visibility |
| 1014 |
+ checks (to avoid the expense when possible). |
| 1015 |
+ """ |
| 1016 |
+ |
| 1017 |
+ db = root_config.trees[self.pkg_tree_map[pkg_type]].dbapi |
| 1018 |
+ |
| 1019 |
+ if hasattr(db, "xmatch"): |
| 1020 |
+ cpv_list = db.xmatch("match-all", atom) |
| 1021 |
+ else: |
| 1022 |
+ cpv_list = db.match(atom) |
| 1023 |
+ |
| 1024 |
+ # USE=multislot can make an installed package appear as if |
| 1025 |
+ # it doesn't satisfy a slot dependency. Rebuilding the ebuild |
| 1026 |
+ # won't do any good as long as USE=multislot is enabled since |
| 1027 |
+ # the newly built package still won't have the expected slot. |
| 1028 |
+ # Therefore, assume that such SLOT dependencies are already |
| 1029 |
+ # satisfied rather than forcing a rebuild. |
| 1030 |
+ installed = pkg_type == 'installed' |
| 1031 |
+ if installed and not cpv_list and atom.slot: |
| 1032 |
+ for cpv in db.match(atom.cp): |
| 1033 |
+ slot_available = False |
| 1034 |
+ for other_db, other_type, other_built, \ |
| 1035 |
+ other_installed, other_keys in \ |
| 1036 |
+ self._filtered_trees[root_config.root]["dbs"]: |
| 1037 |
+ try: |
| 1038 |
+ if atom.slot == \ |
| 1039 |
+ other_db.aux_get(cpv, ["SLOT"])[0]: |
| 1040 |
+ slot_available = True |
| 1041 |
+ break |
| 1042 |
+ except KeyError: |
| 1043 |
+ pass |
| 1044 |
+ if not slot_available: |
| 1045 |
+ continue |
| 1046 |
+ inst_pkg = self._pkg(cpv, "installed", |
| 1047 |
+ root_config, installed=installed) |
| 1048 |
+ # Remove the slot from the atom and verify that |
| 1049 |
+ # the package matches the resulting atom. |
| 1050 |
+ atom_without_slot = portage.dep.remove_slot(atom) |
| 1051 |
+ if atom.use: |
| 1052 |
+ atom_without_slot += str(atom.use) |
| 1053 |
+ atom_without_slot = portage.dep.Atom(atom_without_slot) |
| 1054 |
+ if portage.match_from_list( |
| 1055 |
+ atom_without_slot, [inst_pkg]): |
| 1056 |
+ cpv_list = [inst_pkg.cpv] |
| 1057 |
+ break |
| 1058 |
+ |
| 1059 |
+ if cpv_list: |
| 1060 |
+ |
| 1061 |
+ # descending order |
| 1062 |
+ cpv_list.reverse() |
| 1063 |
+ for cpv in cpv_list: |
| 1064 |
+ try: |
| 1065 |
+ pkg = self._pkg(cpv, pkg_type, root_config, |
| 1066 |
+ installed=installed, onlydeps=onlydeps) |
| 1067 |
+ except portage.exception.PackageNotFound: |
| 1068 |
+ pass |
| 1069 |
+ else: |
| 1070 |
+ if pkg.cp != atom.cp: |
| 1071 |
+ # A cpv can be returned from dbapi.match() as an |
| 1072 |
+ # old-style virtual match even in cases when the |
| 1073 |
+ # package does not actually PROVIDE the virtual. |
| 1074 |
+ # Filter out any such false matches here. |
| 1075 |
+ if not InternalPackageSet(initial_atoms=(atom,) |
| 1076 |
+ ).findAtomForPackage(pkg): |
| 1077 |
+ continue |
| 1078 |
+ yield pkg |
| 1079 |
+ |
| 1080 |
def _select_pkg_highest_available(self, root, atom, onlydeps=False): |
| 1081 |
cache_key = (root, atom, onlydeps) |
| 1082 |
ret = self._highest_pkg_cache.get(cache_key) |
| 1083 |
@@ -1806,7 +1881,6 @@ |
| 1084 |
if not isinstance(atom, portage.dep.Atom): |
| 1085 |
atom = portage.dep.Atom(atom) |
| 1086 |
atom_cp = atom.cp |
| 1087 |
- atom_set = InternalPackageSet(initial_atoms=(atom,)) |
| 1088 |
existing_node = None |
| 1089 |
myeb = None |
| 1090 |
usepkgonly = "--usepkgonly" in self.myopts |
| 1091 |
@@ -1837,63 +1911,18 @@ |
| 1092 |
(found_available_arg and not selective) |
| 1093 |
if want_reinstall and matched_packages: |
| 1094 |
continue |
| 1095 |
- if hasattr(db, "xmatch"): |
| 1096 |
- cpv_list = db.xmatch("match-all", atom) |
| 1097 |
- else: |
| 1098 |
- cpv_list = db.match(atom) |
| 1099 |
|
| 1100 |
- # USE=multislot can make an installed package appear as if |
| 1101 |
- # it doesn't satisfy a slot dependency. Rebuilding the ebuild |
| 1102 |
- # won't do any good as long as USE=multislot is enabled since |
| 1103 |
- # the newly built package still won't have the expected slot. |
| 1104 |
- # Therefore, assume that such SLOT dependencies are already |
| 1105 |
- # satisfied rather than forcing a rebuild. |
| 1106 |
- if installed and not cpv_list and atom.slot: |
| 1107 |
- for cpv in db.match(atom.cp): |
| 1108 |
- slot_available = False |
| 1109 |
- for other_db, other_type, other_built, \ |
| 1110 |
- other_installed, other_keys in dbs: |
| 1111 |
- try: |
| 1112 |
- if atom.slot == \ |
| 1113 |
- other_db.aux_get(cpv, ["SLOT"])[0]: |
| 1114 |
- slot_available = True |
| 1115 |
- break |
| 1116 |
- except KeyError: |
| 1117 |
- pass |
| 1118 |
- if not slot_available: |
| 1119 |
- continue |
| 1120 |
- inst_pkg = self._pkg(cpv, "installed", |
| 1121 |
- root_config, installed=installed) |
| 1122 |
- # Remove the slot from the atom and verify that |
| 1123 |
- # the package matches the resulting atom. |
| 1124 |
- atom_without_slot = portage.dep.remove_slot(atom) |
| 1125 |
- if atom.use: |
| 1126 |
- atom_without_slot += str(atom.use) |
| 1127 |
- atom_without_slot = portage.dep.Atom(atom_without_slot) |
| 1128 |
- if portage.match_from_list( |
| 1129 |
- atom_without_slot, [inst_pkg]): |
| 1130 |
- cpv_list = [inst_pkg.cpv] |
| 1131 |
- break |
| 1132 |
- |
| 1133 |
- if not cpv_list: |
| 1134 |
- continue |
| 1135 |
- |
| 1136 |
- # descending order |
| 1137 |
- cpv_list.reverse() |
| 1138 |
- for cpv in cpv_list: |
| 1139 |
+ for pkg in self._iter_match_pkgs(root_config, pkg_type, atom, |
| 1140 |
+ onlydeps=onlydeps): |
| 1141 |
+ cpv = pkg.cpv |
| 1142 |
# Make --noreplace take precedence over --newuse. |
| 1143 |
- if not installed and noreplace and \ |
| 1144 |
+ if not pkg.installed and noreplace and \ |
| 1145 |
cpv in vardb.match(atom): |
| 1146 |
# If the installed version is masked, it may |
| 1147 |
# be necessary to look at lower versions, |
| 1148 |
# in case there is a visible downgrade. |
| 1149 |
continue |
| 1150 |
reinstall_for_flags = None |
| 1151 |
- try: |
| 1152 |
- pkg = self._pkg(cpv, pkg_type, root_config, |
| 1153 |
- installed=installed, onlydeps=onlydeps) |
| 1154 |
- except portage.exception.PackageNotFound: |
| 1155 |
- continue |
| 1156 |
|
| 1157 |
if not installed or (built and matched_packages): |
| 1158 |
# Only enforce visibility on installed packages |
| 1159 |
@@ -1948,14 +1977,6 @@ |
| 1160 |
# expensive, so it is only performed lazily, after the |
| 1161 |
# above visibility checks are complete. |
| 1162 |
|
| 1163 |
- if pkg.cp != atom.cp: |
| 1164 |
- # A cpv can be returned from dbapi.match() as an |
| 1165 |
- # old-style virtual match even in cases when the |
| 1166 |
- # package does not actually PROVIDE the virtual. |
| 1167 |
- # Filter out any such false matches here. |
| 1168 |
- if not atom_set.findAtomForPackage(pkg): |
| 1169 |
- continue |
| 1170 |
- |
| 1171 |
myarg = None |
| 1172 |
if root == self.target_root: |
| 1173 |
try: |
| 1174 |
|
| 1175 |
Modified: main/branches/prefix/pym/_emerge/emergelog.py |
| 1176 |
=================================================================== |
| 1177 |
--- main/branches/prefix/pym/_emerge/emergelog.py 2009-06-27 14:32:58 UTC (rev 13714) |
| 1178 |
+++ main/branches/prefix/pym/_emerge/emergelog.py 2009-06-27 14:44:56 UTC (rev 13715) |
| 1179 |
@@ -1,3 +1,7 @@ |
| 1180 |
+# Copyright 1999-2009 Gentoo Foundation |
| 1181 |
+# Distributed under the terms of the GNU General Public License v2 |
| 1182 |
+# $Id$ |
| 1183 |
+ |
| 1184 |
import os |
| 1185 |
import sys |
| 1186 |
import time |
| 1187 |
|
| 1188 |
Modified: main/branches/prefix/pym/_emerge/format_size.py |
| 1189 |
=================================================================== |
| 1190 |
--- main/branches/prefix/pym/_emerge/format_size.py 2009-06-27 14:32:58 UTC (rev 13714) |
| 1191 |
+++ main/branches/prefix/pym/_emerge/format_size.py 2009-06-27 14:44:56 UTC (rev 13715) |
| 1192 |
@@ -1,3 +1,6 @@ |
| 1193 |
+# Copyright 1999-2009 Gentoo Foundation |
| 1194 |
+# Distributed under the terms of the GNU General Public License v2 |
| 1195 |
+# $Id$ |
| 1196 |
|
| 1197 |
# formats a size given in bytes nicely |
| 1198 |
def format_size(mysize): |
| 1199 |
|
| 1200 |
Modified: main/branches/prefix/pym/_emerge/getloadavg.py |
| 1201 |
=================================================================== |
| 1202 |
--- main/branches/prefix/pym/_emerge/getloadavg.py 2009-06-27 14:32:58 UTC (rev 13714) |
| 1203 |
+++ main/branches/prefix/pym/_emerge/getloadavg.py 2009-06-27 14:44:56 UTC (rev 13715) |
| 1204 |
@@ -1,3 +1,7 @@ |
| 1205 |
+# Copyright 1999-2009 Gentoo Foundation |
| 1206 |
+# Distributed under the terms of the GNU General Public License v2 |
| 1207 |
+# $Id$ |
| 1208 |
+ |
| 1209 |
import os |
| 1210 |
|
| 1211 |
getloadavg = getattr(os, "getloadavg", None) |
| 1212 |
|
| 1213 |
Modified: main/branches/prefix/pym/_emerge/help.py |
| 1214 |
=================================================================== |
| 1215 |
--- main/branches/prefix/pym/_emerge/help.py 2009-06-27 14:32:58 UTC (rev 13714) |
| 1216 |
+++ main/branches/prefix/pym/_emerge/help.py 2009-06-27 14:44:56 UTC (rev 13715) |
| 1217 |
@@ -1,4 +1,4 @@ |
| 1218 |
-# Copyright 1999-2007 Gentoo Foundation |
| 1219 |
+# Copyright 1999-2009 Gentoo Foundation |
| 1220 |
# Distributed under the terms of the GNU General Public License v2 |
| 1221 |
# $Id$ |
| 1222 |
|
| 1223 |
|
| 1224 |
Modified: main/branches/prefix/pym/_emerge/is_valid_package_atom.py |
| 1225 |
=================================================================== |
| 1226 |
--- main/branches/prefix/pym/_emerge/is_valid_package_atom.py 2009-06-27 14:32:58 UTC (rev 13714) |
| 1227 |
+++ main/branches/prefix/pym/_emerge/is_valid_package_atom.py 2009-06-27 14:44:56 UTC (rev 13715) |
| 1228 |
@@ -1,3 +1,7 @@ |
| 1229 |
+# Copyright 1999-2009 Gentoo Foundation |
| 1230 |
+# Distributed under the terms of the GNU General Public License v2 |
| 1231 |
+# $Id$ |
| 1232 |
+ |
| 1233 |
import re |
| 1234 |
|
| 1235 |
# for an explanation on this logic, see pym/_emerge/__init__.py |
| 1236 |
|
| 1237 |
Modified: main/branches/prefix/pym/_emerge/search.py |
| 1238 |
=================================================================== |
| 1239 |
--- main/branches/prefix/pym/_emerge/search.py 2009-06-27 14:32:58 UTC (rev 13714) |
| 1240 |
+++ main/branches/prefix/pym/_emerge/search.py 2009-06-27 14:44:56 UTC (rev 13715) |
| 1241 |
@@ -1,3 +1,7 @@ |
| 1242 |
+# Copyright 1999-2009 Gentoo Foundation |
| 1243 |
+# Distributed under the terms of the GNU General Public License v2 |
| 1244 |
+# $Id$ |
| 1245 |
+ |
| 1246 |
import os |
| 1247 |
import re |
| 1248 |
from itertools import izip |
| 1249 |
|
| 1250 |
Modified: main/branches/prefix/pym/_emerge/show_invalid_depstring_notice.py |
| 1251 |
=================================================================== |
| 1252 |
--- main/branches/prefix/pym/_emerge/show_invalid_depstring_notice.py 2009-06-27 14:32:58 UTC (rev 13714) |
| 1253 |
+++ main/branches/prefix/pym/_emerge/show_invalid_depstring_notice.py 2009-06-27 14:44:56 UTC (rev 13715) |
| 1254 |
@@ -1,3 +1,7 @@ |
| 1255 |
+# Copyright 1999-2009 Gentoo Foundation |
| 1256 |
+# Distributed under the terms of the GNU General Public License v2 |
| 1257 |
+# $Id$ |
| 1258 |
+ |
| 1259 |
import logging |
| 1260 |
import os |
| 1261 |
import textwrap |
| 1262 |
|
| 1263 |
Modified: main/branches/prefix/pym/_emerge/stdout_spinner.py |
| 1264 |
=================================================================== |
| 1265 |
--- main/branches/prefix/pym/_emerge/stdout_spinner.py 2009-06-27 14:32:58 UTC (rev 13714) |
| 1266 |
+++ main/branches/prefix/pym/_emerge/stdout_spinner.py 2009-06-27 14:44:56 UTC (rev 13715) |
| 1267 |
@@ -1,3 +1,7 @@ |
| 1268 |
+# Copyright 1999-2009 Gentoo Foundation |
| 1269 |
+# Distributed under the terms of the GNU General Public License v2 |
| 1270 |
+# $Id$ |
| 1271 |
+ |
| 1272 |
import platform |
| 1273 |
import sys |
| 1274 |
import time |
| 1275 |
|
| 1276 |
Modified: main/branches/prefix/pym/_emerge/unmerge.py |
| 1277 |
=================================================================== |
| 1278 |
--- main/branches/prefix/pym/_emerge/unmerge.py 2009-06-27 14:32:58 UTC (rev 13714) |
| 1279 |
+++ main/branches/prefix/pym/_emerge/unmerge.py 2009-06-27 14:44:56 UTC (rev 13715) |
| 1280 |
@@ -1,3 +1,7 @@ |
| 1281 |
+# Copyright 1999-2009 Gentoo Foundation |
| 1282 |
+# Distributed under the terms of the GNU General Public License v2 |
| 1283 |
+# $Id$ |
| 1284 |
+ |
| 1285 |
import logging |
| 1286 |
import os |
| 1287 |
import sys |
| 1288 |
|
| 1289 |
Modified: main/branches/prefix/pym/_emerge/userquery.py |
| 1290 |
=================================================================== |
| 1291 |
--- main/branches/prefix/pym/_emerge/userquery.py 2009-06-27 14:32:58 UTC (rev 13714) |
| 1292 |
+++ main/branches/prefix/pym/_emerge/userquery.py 2009-06-27 14:44:56 UTC (rev 13715) |
| 1293 |
@@ -1,3 +1,7 @@ |
| 1294 |
+# Copyright 1999-2009 Gentoo Foundation |
| 1295 |
+# Distributed under the terms of the GNU General Public License v2 |
| 1296 |
+# $Id$ |
| 1297 |
+ |
| 1298 |
import sys |
| 1299 |
|
| 1300 |
from portage.output import bold, create_color_func |
| 1301 |
|
| 1302 |
Modified: main/branches/prefix/pym/_emerge/visible.py |
| 1303 |
=================================================================== |
| 1304 |
--- main/branches/prefix/pym/_emerge/visible.py 2009-06-27 14:32:58 UTC (rev 13714) |
| 1305 |
+++ main/branches/prefix/pym/_emerge/visible.py 2009-06-27 14:44:56 UTC (rev 13715) |
| 1306 |
@@ -1,3 +1,7 @@ |
| 1307 |
+# Copyright 1999-2009 Gentoo Foundation |
| 1308 |
+# Distributed under the terms of the GNU General Public License v2 |
| 1309 |
+# $Id$ |
| 1310 |
+ |
| 1311 |
# for an explanation on this logic, see pym/_emerge/__init__.py |
| 1312 |
import os |
| 1313 |
import sys |
Archives