Hi all,
I'm looking for a review of the fix for bug #8125:
http://defect.opensolaris.org/bz/show_bug.cgi?id=8125
gen_os_files.py doesn't properly handle renamed package after
classified package.
If an IPS package definition file has multiple package definitions
in it, and one or more of the initial ones have classification lines
and latter ones don't, then the gen_os_files.py script incorrectly
handles the latter files, treating them as classified rather than
ignoring them.
What needs to happen is that on encountering an "end package" line
in an IPS package definition file, the "classification_found"
variable needs to be reset to False.
I haven't generated a webrev as the fix is trivial:
diff -r be10c00c0f45 src/util/distro-import/gen_os_files.py
--- a/src/util/distro-import/gen_os_files.py Mon Apr 13 10:05:02 2009
-0700
+++ b/src/util/distro-import/gen_os_files.py Mon Apr 13 11:23:34 2009
-0700
@@ -199,6 +199,9 @@
self.save_entry(pathname, category, sub_category)
+ elif line.startswith("end package"):
+ classification_found = False
+
if self.package_name and not classification_found:
self.save_entry(pathname, None, None)
With this change, if I run gen_os_files.py against the latest pkg
workspace, it generates the following diff for
.../src/gui/data/opensolaris.org:
diff -r be10c00c0f45 src/gui/data/opensolaris.org
--- a/src/gui/data/opensolaris.org Mon Apr 13 10:05:02 2009 -0700
+++ b/src/gui/data/opensolaris.org Mon Apr 13 11:07:21 2009 -0700
@@ -3934,6 +3934,9 @@
[developer/netbeans/plugin/nb-dtrace]
category = System
+[developer/opensolaris/osnet]
+category = Distribution Tools
+
[developer/tool/exuberant-ctags]
category = Editors
@@ -3958,6 +3961,9 @@
[lang-support-arabic]
category = Localizations (System)
+[lang-support-belarusian]
+category = Localizations (System)
+
[lang-support-bulgarian]
category = Localizations (System)
@@ -4000,6 +4006,9 @@
[lang-support-french]
category = Localizations (System)
+[lang-support-georgian]
+category = Localizations (System)
+
[lang-support-german]
category = Localizations (System)
@@ -4078,7 +4087,7 @@
[lang-support-serbo-croatian]
category = Localizations (System)
-[lang-support-slovakian]
+[lang-support-slovak]
category = Localizations (System)
[lang-support-slovenian]
I don't plan to check that part back as I know that David is working
on the changes for the 111a respin integration, and i expect him to
rerun gen_os_files.py for himself, so the code review request is just
for the change to gen_os_files.py.
Thanks.
_______________________________________________
pkg-discuss mailing list
[email protected]
http://mail.opensolaris.org/mailman/listinfo/pkg-discuss
