| 1 |
Author: zmedico |
| 2 |
Date: 2010-02-23 02:15:35 +0000 (Tue, 23 Feb 2010) |
| 3 |
New Revision: 15437 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/bin/repoman |
| 7 |
main/trunk/pym/portage/__init__.py |
| 8 |
Log: |
| 9 |
Add deprecation warnings for unused digestgen() parameters. |
| 10 |
|
| 11 |
|
| 12 |
Modified: main/trunk/bin/repoman |
| 13 |
=================================================================== |
| 14 |
--- main/trunk/bin/repoman 2010-02-22 19:59:39 UTC (rev 15436) |
| 15 |
+++ main/trunk/bin/repoman 2010-02-23 02:15:35 UTC (rev 15437) |
| 16 |
@@ -2335,8 +2335,7 @@ |
| 17 |
mydone=[] |
| 18 |
if repolevel==3: # In a package dir |
| 19 |
repoman_settings["O"] = startdir |
| 20 |
- portage.digestgen([], repoman_settings, manifestonly=1, |
| 21 |
- myportdb=portdb) |
| 22 |
+ portage.digestgen([], repoman_settings, myportdb=portdb) |
| 23 |
elif repolevel==2: # In a category dir |
| 24 |
for x in myfiles: |
| 25 |
xs=x.split("/") |
| 26 |
@@ -2350,8 +2349,7 @@ |
| 27 |
repoman_settings["O"] = os.path.join(startdir, xs[0]) |
| 28 |
if not os.path.isdir(repoman_settings["O"]): |
| 29 |
continue |
| 30 |
- portage.digestgen([], repoman_settings, manifestonly=1, |
| 31 |
- myportdb=portdb) |
| 32 |
+ portage.digestgen([], repoman_settings, myportdb=portdb) |
| 33 |
elif repolevel==1: # repo-cvsroot |
| 34 |
print(green("RepoMan sez:"), "\"You're rather crazy... doing the entire repository.\"\n") |
| 35 |
for x in myfiles: |
| 36 |
@@ -2366,8 +2364,7 @@ |
| 37 |
repoman_settings["O"] = os.path.join(startdir, xs[0], xs[1]) |
| 38 |
if not os.path.isdir(repoman_settings["O"]): |
| 39 |
continue |
| 40 |
- portage.digestgen([], repoman_settings, manifestonly=1, |
| 41 |
- myportdb=portdb) |
| 42 |
+ portage.digestgen([], repoman_settings, myportdb=portdb) |
| 43 |
else: |
| 44 |
print(red("I'm confused... I don't know where I am!")) |
| 45 |
sys.exit(1) |
| 46 |
|
| 47 |
Modified: main/trunk/pym/portage/__init__.py |
| 48 |
=================================================================== |
| 49 |
--- main/trunk/pym/portage/__init__.py 2010-02-22 19:59:39 UTC (rev 15436) |
| 50 |
+++ main/trunk/pym/portage/__init__.py 2010-02-23 02:15:35 UTC (rev 15437) |
| 51 |
@@ -1376,17 +1376,23 @@ |
| 52 |
return retval >> 8 |
| 53 |
return retval |
| 54 |
|
| 55 |
-def digestgen(myarchives, mysettings, overwrite=1, manifestonly=0, myportdb=None): |
| 56 |
+def digestgen(myarchives, mysettings, overwrite=None, manifestonly=None, myportdb=None): |
| 57 |
""" |
| 58 |
- Generates a digest file if missing. Assumes all files are available. |
| 59 |
- DEPRECATED: this now only is a compability wrapper for |
| 60 |
- portage.manifest.Manifest() |
| 61 |
- NOTE: manifestonly and overwrite are useless with manifest2 and |
| 62 |
- are therefore ignored.""" |
| 63 |
+ Generates a digest file if missing. Fetches files if necessary. |
| 64 |
+ """ |
| 65 |
if myportdb is None: |
| 66 |
- writemsg("Warning: myportdb not specified to digestgen\n") |
| 67 |
+ warnings.warn("portage.digestgen() called without 'myportdb' parameter", |
| 68 |
+ DeprecationWarning, stacklevel=2) |
| 69 |
global portdb |
| 70 |
myportdb = portdb |
| 71 |
+ if overwrite is not None: |
| 72 |
+ warnings.warn("portage.digestgen() called with " + \ |
| 73 |
+ "deprecated 'overwrite' parameter", |
| 74 |
+ DeprecationWarning, stacklevel=2) |
| 75 |
+ if manifestonly is not None: |
| 76 |
+ warnings.warn("portage.digestgen() called with " + \ |
| 77 |
+ "deprecated 'manifestonly' parameter", |
| 78 |
+ DeprecationWarning, stacklevel=2) |
| 79 |
global _doebuild_manifest_exempt_depend |
| 80 |
try: |
| 81 |
_doebuild_manifest_exempt_depend += 1 |
| 82 |
@@ -3354,17 +3360,15 @@ |
| 83 |
|
| 84 |
try: |
| 85 |
if mydo == "manifest": |
| 86 |
- return not digestgen(aalist, mysettings, overwrite=1, |
| 87 |
- manifestonly=1, myportdb=mydbapi) |
| 88 |
+ return not digestgen(aalist, mysettings, myportdb=mydbapi) |
| 89 |
elif mydo == "digest": |
| 90 |
- return not digestgen(aalist, mysettings, overwrite=1, |
| 91 |
- myportdb=mydbapi) |
| 92 |
+ return not digestgen(aalist, mysettings, myportdb=mydbapi) |
| 93 |
elif mydo != 'fetch' and not emerge_skip_digest and \ |
| 94 |
"digest" in mysettings.features: |
| 95 |
# Don't do this when called by emerge or when called just |
| 96 |
# for fetch (especially parallel-fetch) since it's not needed |
| 97 |
# and it can interfere with parallel tasks. |
| 98 |
- digestgen(aalist, mysettings, overwrite=0, myportdb=mydbapi) |
| 99 |
+ digestgen(aalist, mysettings, myportdb=mydbapi) |
| 100 |
except portage.exception.PermissionDenied as e: |
| 101 |
writemsg(_("!!! Permission Denied: %s\n") % (e,), noiselevel=-1) |
| 102 |
if mydo in ("digest", "manifest"): |
Archives