Danek Duvall wrote: >> http://cr.opensolaris.org/~richb/pkg-395-v1/ > > You'll need to remove the use of sysv_to_new_name() on line 387, too. It > looks like that leaves the last uses of the function on lines 589 and 591 > (I guess 598 and 590 in your file). If you get rid of those calls, too, > that means we'd be able to have "depend" statements using packages with > slashes in their names: > > package graphics/png > description "ping!" > version 1.2.3.4 > import SUNWpng > depend system/libc > end package > > which I think wouldn't work otherwise.
Indeed. Okay, here's a new version of the webrev: http://cr.opensolaris.org/~richb/pkg-395-v2/ I created two new packages called libd and libe under .../gate/src/util/distro-import/98/common/system package system/libd description "Package to test depend line with slashes" version 0.1 depend system/libe end package package system/libe description "The depend package for a package name with slashes" version 0.1 depend SUNWcsl end package I did the following two tests: ---------------------------------------------------------------------------- #! /bin/ksh export ROOT=/export/home/richb/pkg/bugs/395/gate/proto/root_i386 export PYTHONPATH=${ROOT}/usr/lib/python2.4/vendor-packages export REPO=http://localhost:2395/ export WOS_PKGS=/export/home/pkg-solaris/WOS_Packages/x/98/Solaris_11/Product/ export JUST_THESE_PKGS="system/libd" (cd src/util/distro-import ; \ make -e clobber ; \ make -e 98/slim_import ) > errs.import 2>&1 & to test the dependency changes, and got the following in errs.import: ... Second pass: 2008-10-01 09:48:36.691419 New packages: Package 'system/libd' Version: 0.1-0.98 Description: Package to test depend line with slashes open system/[EMAIL PROTECTED] system/libd add depend require system/libe system/libd add set description=Package to test depend line with slashes close pkg:/system/[EMAIL PROTECTED],5.11-0.98:20081001T164836Z: PUBLISHED and the package was published. ---------------------------------------------------------------------------- #! /bin/ksh export ROOT=/export/home/richb/pkg/bugs/395/gate/proto/root_i386 export PYTHONPATH=${ROOT}/usr/lib/python2.4/vendor-packages export REPO=http://localhost:2395/ export WOS_PKGS=/export/home/pkg-solaris/WOS_Packages/x/98/Solaris_11/Product/ export JUST_THESE_PKGS="system/libd" export EXTRA_OPTIONS=-n (cd src/util/distro-import ; \ make -e clobber ; \ make -e 98/slim_import ) > errs.import 2>&1 & to test the dryrun change, and got the following in errs.import: Second pass: 2008-10-01 09:51:34.348948 New packages: Package 'system/libd' Version: 0.1-0.98 Description: Package to test depend line with slashes open system/[EMAIL PROTECTED] system/libd add depend require system/libe system/libd add set description=Package to test depend line with slashes close system/[EMAIL PROTECTED]: PUBLISHED but no package published. A debug line (which I've now removed) showed that it went through the change at line 387 in solaris.py Thanks. _______________________________________________ pkg-discuss mailing list [email protected] http://mail.opensolaris.org/mailman/listinfo/pkg-discuss
