On 01/31/11 11:17 PM, Danek Duvall wrote:
Well, I hope it's the final take:
http://cr.opensolaris.org/~dduvall/pkg-conflicts-5/
I don't have a diff against the last version, since there were some gate
merges in between, and it wasn't looking terribly useful. But the major
changes are in image.py, surrounding the fast action lookup routines
(Shawn, if you could at least look to make sure that my temporary file
handling isn't too insane; I've got a couple of XXX comment questions in
there), and in imageplan.py, in the way that we set up the actions to walk
over (lines 932 to 1018).
src/modules/actions/directory.py:
line 24: s/2010/2011/
src/modules/actions/driver.py:
lines 24-25: update copyright
src/modules/actions/generic.py:
line 24: s/2010/2011/
src/modules/actions/group.py:
line 24: s/2010/2011/
lines 163-169: is there a separate bug# for this fix?
src/modules/actions/hardlink.py
line 24: s/2010/2011/
src/modules/actions/legacy.py
line 24: s/2010/2011/
src/modules/actions/license.py
line 25: s/2010/2011/
src/modules/actions/link.py:
line 24: s/2010/2011/
src/modules/actions/user.py:
line 24: s/2010/2011/
lines 278-281: is there a separate bug# for this fix?
src/modules/client/actuator.py:
line 24: s/2010/2011/
src/modules/client/api_errors.py:
line 447: nit: s/etc/etc./
line 1098: s/connection/access/ ?
src/modules/client/history.py:
line 24: s/2010/2008, 2011/
src/modules/client/image.py:
line 733: likely best option for older images
line 2095: delete this since you added 2040-2041.
line 2820: docstring?
line 2832: do you really want set actions too?
lines 2849-2850: s/w/wb/
line 2858: looks like this should be at the top of try block;
otherwise, the return on 2878 could fail if exception
encountered before declaration
line 2873: s/, e:/:/
line 2884-2885: no need to really; I wouldn't worry about older images
beyond what you've already done
lines 2893-2901: you shouldn't need this since you got the directory
from self.temporary_dir(); it already deals with it
line 2909: docstring?
lines 2913, 2935, 2947: s/file/open/; "preferred way to open a file"
according to pydoc; also, should probably use "rb"?
line 2946: docstring?
src/modules/client/imageplan.py:
lines 713-714: suggest changing to:
sort_key = operator.itemgetter(1)
actions = sorted(actions, key=sort_key)
oactions = sorted(oactions, key=sort_key)
line 740: s/actions/action's/ ?
line 915: why not:
types = sorted(pkg.actions.types.itervalues(), key=kf)
lines 988, 1016: PkgFmri(fmristr, "5.11") ?
line 1917: s/[]/actuator.Actuator()/ ?
src/modules/client/pkgplan.py:
line 24: s/2010/2011/
src/modules/client/transport/exception.py:
line 24: s/2010/2011/
src/modules/fmri.py:
line 24: s/2010/2011/
src/modules/manifest.py:
line 24: s/2010/2011/
src/modules/variant.py:
line 24: s/2010/2011/
src/tests/cli/t_pkgdep.py:
line 23: s/2010/2011/
-Shawn
_______________________________________________
pkg-discuss mailing list
[email protected]
http://mail.opensolaris.org/mailman/listinfo/pkg-discuss
