| 1 |
Author: grobian |
| 2 |
Date: 2010-02-23 17:17:09 +0000 (Tue, 23 Feb 2010) |
| 3 |
New Revision: 15440 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/branches/prefix/bin/repoman |
| 7 |
main/branches/prefix/pym/_emerge/Scheduler.py |
| 8 |
main/branches/prefix/pym/portage/__init__.py |
| 9 |
Log: |
| 10 |
Merged from trunk -r15436:15438 |
| 11 |
|
| 12 |
| 15437 | Add deprecation warnings for unused digestgen() parameters. | |
| 13 |
| zmedico | | |
| 14 |
|
| 15 |
| 15438 | Make the first two positional arguments of digestgen() into | |
| 16 |
| zmedico | keyword arguments since the first one isn't really needed | |
| 17 |
| | (when this code is in stable we can start showing a | |
| 18 |
| | deprecation warning when the redundant argument is used). | |
| 19 |
|
| 20 |
|
| 21 |
Modified: main/branches/prefix/bin/repoman |
| 22 |
=================================================================== |
| 23 |
--- main/branches/prefix/bin/repoman 2010-02-23 17:14:10 UTC (rev 15439) |
| 24 |
+++ main/branches/prefix/bin/repoman 2010-02-23 17:17:09 UTC (rev 15440) |
| 25 |
@@ -1011,7 +1011,7 @@ |
| 26 |
portage._doebuild_manifest_exempt_depend -= 1 |
| 27 |
|
| 28 |
repoman_settings["O"] = checkdir |
| 29 |
- if not portage.digestgen([], repoman_settings, myportdb=portdb): |
| 30 |
+ if not portage.digestgen(mysettings=repoman_settings, myportdb=portdb): |
| 31 |
print("Unable to generate manifest.") |
| 32 |
dofail = 1 |
| 33 |
if options.mode == "manifest": |
| 34 |
@@ -2339,8 +2339,7 @@ |
| 35 |
mydone=[] |
| 36 |
if repolevel==3: # In a package dir |
| 37 |
repoman_settings["O"] = startdir |
| 38 |
- portage.digestgen([], repoman_settings, manifestonly=1, |
| 39 |
- myportdb=portdb) |
| 40 |
+ portage.digestgen(mysettings=repoman_settings, myportdb=portdb) |
| 41 |
elif repolevel==2: # In a category dir |
| 42 |
for x in myfiles: |
| 43 |
xs=x.split("/") |
| 44 |
@@ -2354,8 +2353,7 @@ |
| 45 |
repoman_settings["O"] = os.path.join(startdir, xs[0]) |
| 46 |
if not os.path.isdir(repoman_settings["O"]): |
| 47 |
continue |
| 48 |
- portage.digestgen([], repoman_settings, manifestonly=1, |
| 49 |
- myportdb=portdb) |
| 50 |
+ portage.digestgen(mysettings=repoman_settings, myportdb=portdb) |
| 51 |
elif repolevel==1: # repo-cvsroot |
| 52 |
print(green("RepoMan sez:"), "\"You're rather crazy... doing the entire repository.\"\n") |
| 53 |
for x in myfiles: |
| 54 |
@@ -2370,8 +2368,7 @@ |
| 55 |
repoman_settings["O"] = os.path.join(startdir, xs[0], xs[1]) |
| 56 |
if not os.path.isdir(repoman_settings["O"]): |
| 57 |
continue |
| 58 |
- portage.digestgen([], repoman_settings, manifestonly=1, |
| 59 |
- myportdb=portdb) |
| 60 |
+ portage.digestgen(mysettings=repoman_settings, myportdb=portdb) |
| 61 |
else: |
| 62 |
print(red("I'm confused... I don't know where I am!")) |
| 63 |
sys.exit(1) |
| 64 |
|
| 65 |
Modified: main/branches/prefix/pym/_emerge/Scheduler.py |
| 66 |
=================================================================== |
| 67 |
--- main/branches/prefix/pym/_emerge/Scheduler.py 2010-02-23 17:14:10 UTC (rev 15439) |
| 68 |
+++ main/branches/prefix/pym/_emerge/Scheduler.py 2010-02-23 17:17:09 UTC (rev 15440) |
| 69 |
@@ -591,7 +591,7 @@ |
| 70 |
if ebuild_path is None: |
| 71 |
raise AssertionError("ebuild not found for '%s'" % x.cpv) |
| 72 |
pkgsettings['O'] = os.path.dirname(ebuild_path) |
| 73 |
- if not portage.digestgen([], pkgsettings, myportdb=portdb): |
| 74 |
+ if not portage.digestgen(mysettings=pkgsettings, myportdb=portdb): |
| 75 |
writemsg_level( |
| 76 |
"!!! Unable to generate manifest for '%s'.\n" \ |
| 77 |
% x.cpv, level=logging.ERROR, noiselevel=-1) |
| 78 |
|
| 79 |
Modified: main/branches/prefix/pym/portage/__init__.py |
| 80 |
=================================================================== |
| 81 |
--- main/branches/prefix/pym/portage/__init__.py 2010-02-23 17:14:10 UTC (rev 15439) |
| 82 |
+++ main/branches/prefix/pym/portage/__init__.py 2010-02-23 17:17:09 UTC (rev 15440) |
| 83 |
@@ -1396,17 +1396,36 @@ |
| 84 |
return retval >> 8 |
| 85 |
return retval |
| 86 |
|
| 87 |
-def digestgen(myarchives, mysettings, overwrite=1, manifestonly=0, myportdb=None): |
| 88 |
+def digestgen(myarchives=None, mysettings=None, |
| 89 |
+ overwrite=None, manifestonly=None, myportdb=None): |
| 90 |
""" |
| 91 |
- Generates a digest file if missing. Assumes all files are available. |
| 92 |
- DEPRECATED: this now only is a compability wrapper for |
| 93 |
- portage.manifest.Manifest() |
| 94 |
- NOTE: manifestonly and overwrite are useless with manifest2 and |
| 95 |
- are therefore ignored.""" |
| 96 |
+ Generates a digest file if missing. Fetches files if necessary. |
| 97 |
+ NOTE: myarchives and mysettings used to be positional arguments, |
| 98 |
+ so their order must be preserved for backward compatibility. |
| 99 |
+ @param mysettings: the ebuild config (mysettings["O"] must correspond |
| 100 |
+ to the ebuild's parent directory) |
| 101 |
+ @type mysettings: config |
| 102 |
+ @param myportdb: a portdbapi instance |
| 103 |
+ @type myportdb: portdbapi |
| 104 |
+ @rtype: int |
| 105 |
+ @returns: 1 on success and 0 on failure |
| 106 |
+ """ |
| 107 |
+ if mysettings is None: |
| 108 |
+ raise TypeError("portage.digestgen(): missing" + \ |
| 109 |
+ " required 'mysettings' parameter") |
| 110 |
if myportdb is None: |
| 111 |
- writemsg("Warning: myportdb not specified to digestgen\n") |
| 112 |
+ warnings.warn("portage.digestgen() called without 'myportdb' parameter", |
| 113 |
+ DeprecationWarning, stacklevel=2) |
| 114 |
global portdb |
| 115 |
myportdb = portdb |
| 116 |
+ if overwrite is not None: |
| 117 |
+ warnings.warn("portage.digestgen() called with " + \ |
| 118 |
+ "deprecated 'overwrite' parameter", |
| 119 |
+ DeprecationWarning, stacklevel=2) |
| 120 |
+ if manifestonly is not None: |
| 121 |
+ warnings.warn("portage.digestgen() called with " + \ |
| 122 |
+ "deprecated 'manifestonly' parameter", |
| 123 |
+ DeprecationWarning, stacklevel=2) |
| 124 |
global _doebuild_manifest_exempt_depend |
| 125 |
try: |
| 126 |
_doebuild_manifest_exempt_depend += 1 |
| 127 |
@@ -1514,8 +1533,7 @@ |
| 128 |
return 0 |
| 129 |
writemsg_stdout(_(">>> Creating Manifest for %s\n") % mysettings["O"]) |
| 130 |
try: |
| 131 |
- mf.create(requiredDistfiles=myarchives, |
| 132 |
- assumeDistHashesSometimes=True, |
| 133 |
+ mf.create(assumeDistHashesSometimes=True, |
| 134 |
assumeDistHashesAlways=( |
| 135 |
"assume-digests" in mysettings.features)) |
| 136 |
except portage.exception.FileNotFound as e: |
| 137 |
@@ -3375,17 +3393,15 @@ |
| 138 |
|
| 139 |
try: |
| 140 |
if mydo == "manifest": |
| 141 |
- return not digestgen(aalist, mysettings, overwrite=1, |
| 142 |
- manifestonly=1, myportdb=mydbapi) |
| 143 |
+ return not digestgen(mysettings=mysettings, myportdb=mydbapi) |
| 144 |
elif mydo == "digest": |
| 145 |
- return not digestgen(aalist, mysettings, overwrite=1, |
| 146 |
- myportdb=mydbapi) |
| 147 |
+ return not digestgen(mysettings=mysettings, myportdb=mydbapi) |
| 148 |
elif mydo != 'fetch' and not emerge_skip_digest and \ |
| 149 |
"digest" in mysettings.features: |
| 150 |
# Don't do this when called by emerge or when called just |
| 151 |
# for fetch (especially parallel-fetch) since it's not needed |
| 152 |
# and it can interfere with parallel tasks. |
| 153 |
- digestgen(aalist, mysettings, overwrite=0, myportdb=mydbapi) |
| 154 |
+ digestgen(mysettings=mysettings, myportdb=mydbapi) |
| 155 |
except portage.exception.PermissionDenied as e: |
| 156 |
writemsg(_("!!! Permission Denied: %s\n") % (e,), noiselevel=-1) |
| 157 |
if mydo in ("digest", "manifest"): |
Archives