I sent out part of this back in November, but added another related change:

    --- a/src/publish.py
    +++ b/src/publish.py
    @@ -470,13 +470,14 @@ def gen_actions(files, timestamp_files, 
             for filename in files:
                     bundle = pkg.bundle.make_bundle(filename, target_files)
                     for action in bundle:
    -                        if action.name == "file":
    +                        if action.name in ("file", "dir"):
                                     basename = 
os.path.basename(action.attrs["path"])
                                     for pattern in timestamp_files:
                                             if fnmatch.fnmatch(basename, 
pattern):
                                                     break
                                     else:
                                             action.attrs.pop("timestamp", None)
    +                        action.attrs.pop("pkg.size", None)
     
                         yield action, action.name in nopub_actions

fixes:

    17493 pkgsend generate emits timestamps on directory actions
    17864 pkgsend generate emits pkg.size attributes on file actions

And yes, I've run the testsuite and the packaging build this time.  :)

Thanks,
Danek
_______________________________________________
pkg-discuss mailing list
[email protected]
http://mail.opensolaris.org/mailman/listinfo/pkg-discuss

Reply via email to