Tim Foster wrote:
> On 01/28/12 07:08 PM, Danek Duvall wrote:
> >So long, good riddance:
> >
> > https://cr.opensolaris.org/action/browse/pkg/dduvall/rm-importer/
>
> Excellent stuff, I'm happy to see it go! Are RE still using/running
> the test cases for importer.py?
I doubt it.
> There's bits of doc/manifest_preprocessor.txt that still refer to the
> importer, though that document as a whole is pretty out of date.
I'll leave that; I don't really want to start a full document cleanup.
> wos_conversion.txt can probably also go, I think.
Yeah, probably. I've also gotten rid of util/Makefile.buildnum, which was
no longer referenced. Plus some code from a couple of bundle modules and
publish.py, which I'm simply inlining here:
diff --git a/src/modules/bundle/SolarisPackageDatastreamBundle.py
b/src/modules/bundle/SolarisPackageDatastreamBundle.py
--- a/src/modules/bundle/SolarisPackageDatastreamBundle.py
+++ b/src/modules/bundle/SolarisPackageDatastreamBundle.py
@@ -166,11 +166,8 @@ class SolarisPackageDatastreamBundle(Sol
act =
hardlink.HardLinkAction(path=mapline.pathname,
target=mapline.target)
elif mapline.type == "i" and mapline.pathname ==
"copyright":
- # XXX path is set there because the importer
relies on
- # it; when the importer dies, this can too.
act = license.LicenseAction(data=ci.extractfile(),
- license="%s.copyright" % self.pkgname,
- path=mapline.pathname)
+ license="%s.copyright" % self.pkgname)
act.hash = "install/copyright"
elif mapline.type == "i":
if mapline.pathname not in ["depend", "pkginfo"]:
diff --git a/src/modules/bundle/SolarisPackageDirBundle.py
b/src/modules/bundle/SolarisPackageDirBundle.py
--- a/src/modules/bundle/SolarisPackageDirBundle.py
+++ b/src/modules/bundle/SolarisPackageDirBundle.py
@@ -197,11 +197,8 @@ class SolarisPackageDirBundle(pkg.bundle
act =
hardlink.HardLinkAction(path=mapline.pathname,
target=mapline.target)
elif mapline.type == "i" and mapline.pathname ==
"copyright":
- # XXX path is set there because the importer
relies on
- # it; when the importer dies, this can too.
act = license.LicenseAction(data,
- license="%s.copyright" % self.pkgname,
- path=mapline.pathname)
+ license="%s.copyright" % self.pkgname)
if act.hash == "NOHASH" and \
isinstance(data, basestring) and \
data.startswith(self.filename):
diff --git a/src/publish.py b/src/publish.py
--- a/src/publish.py
+++ b/src/publish.py
@@ -550,11 +550,6 @@ def gen_actions(files, timestamp_files,
else:
action.attrs.pop("timestamp", None)
- if action.name == "license":
- # The bundle code provides this for the
importer,
- # but it is unnecessary in all other cases.
- action.attrs.pop("path", None)
-
if minimal:
# pkgsend import needs attributes such as
size
# retained so that the publication modules
know
Thanks,
Danek
_______________________________________________
pkg-discuss mailing list
[email protected]
http://mail.opensolaris.org/mailman/listinfo/pkg-discuss
