| 1 |
Author: zmedico |
| 2 |
Date: 2010-02-25 22:31:50 +0000 (Thu, 25 Feb 2010) |
| 3 |
New Revision: 15469 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/portage/__init__.py |
| 7 |
main/trunk/pym/portage/_deprecated.py |
| 8 |
Log: |
| 9 |
Move getvirtuals to _deprecated module. |
| 10 |
|
| 11 |
|
| 12 |
Modified: main/trunk/pym/portage/__init__.py |
| 13 |
=================================================================== |
| 14 |
--- main/trunk/pym/portage/__init__.py 2010-02-25 22:28:00 UTC (rev 15468) |
| 15 |
+++ main/trunk/pym/portage/__init__.py 2010-02-25 22:31:50 UTC (rev 15469) |
| 16 |
@@ -136,7 +136,7 @@ |
| 17 |
'cpv_getkey@getCPFromCPV,endversion_keys,' + \ |
| 18 |
'suffix_value@endversion,pkgcmp,pkgsplit,vercmp,ververify', |
| 19 |
'portage.xpak', |
| 20 |
- 'portage._deprecated:dep_virtual,digestParseFile,pkgmerge', |
| 21 |
+ 'portage._deprecated:dep_virtual,digestParseFile,getvirtuals,pkgmerge', |
| 22 |
) |
| 23 |
|
| 24 |
import portage.const |
| 25 |
@@ -656,17 +656,6 @@ |
| 26 |
writemsg("\n\n", noiselevel=-1) |
| 27 |
return True |
| 28 |
|
| 29 |
-# gets virtual package settings |
| 30 |
-def getvirtuals(myroot): |
| 31 |
- """ |
| 32 |
- Calls portage.settings.getvirtuals(). |
| 33 |
- @deprecated: Use portage.settings.getvirtuals(). |
| 34 |
- """ |
| 35 |
- global settings |
| 36 |
- warnings.warn("portage.getvirtuals() is deprecated", |
| 37 |
- DeprecationWarning, stacklevel=2) |
| 38 |
- return settings.getvirtuals() |
| 39 |
- |
| 40 |
def commit_mtimedb(mydict=None, filename=None): |
| 41 |
if mydict is None: |
| 42 |
global mtimedb |
| 43 |
|
| 44 |
Modified: main/trunk/pym/portage/_deprecated.py |
| 45 |
=================================================================== |
| 46 |
--- main/trunk/pym/portage/_deprecated.py 2010-02-25 22:28:00 UTC (rev 15468) |
| 47 |
+++ main/trunk/pym/portage/_deprecated.py 2010-02-25 22:31:50 UTC (rev 15469) |
| 48 |
@@ -64,6 +64,15 @@ |
| 49 |
newsplit.append(x) |
| 50 |
return newsplit |
| 51 |
|
| 52 |
+def getvirtuals(myroot): |
| 53 |
+ """ |
| 54 |
+ Calls portage.settings.getvirtuals(). |
| 55 |
+ @deprecated: Use portage.settings.getvirtuals(). |
| 56 |
+ """ |
| 57 |
+ warnings.warn("portage.getvirtuals() is deprecated", |
| 58 |
+ DeprecationWarning, stacklevel=2) |
| 59 |
+ return portage.settings.getvirtuals() |
| 60 |
+ |
| 61 |
def pkgmerge(mytbz2, myroot, mysettings, mydbapi=None, |
| 62 |
vartree=None, prev_mtimes=None, blockers=None): |
| 63 |
"""will merge a .tbz2 file, returning a list of runtime dependencies |
Archives