I found that spec file with dependency on package with no branch creates
incorrect fmri in manifest. Please find my patch for pkgtool below to fix
that:

--- /opt/jdsbld/lib/pkgbuild-1.3.101/pkgdb.pm.orig      2010-03-11 
15:34:24.124619259 +0100
+++ /opt/jdsbld/lib/pkgbuild-1.3.101/pkgdb.pm   2010-03-11 16:36:17.634379118 
+0100
@@ -273,8 +273,12 @@
     if ($search_out eq "") {
        # check if a package with this name is installed locally
        $search_out = `/usr/bin/pkg info -l '$pkg' 2>/dev/null`;
-       if ($search_out =~ /Name: $pkg\n.*Version: ([0-9.]*)\n.*Branch: 
([0-9.]*)/s) {
-           $self->{ips_pkgname_cache}->{$pkg} = "${pk...@$1-$2";
+       if ($search_out =~ /Name: $pkg\n.*Version: ([0-9.]*)\n.*Branch: 
([0-9.]+|None)/s) {
+           if ($2 eq "None") {
+               $self->{ips_pkgname_cache}->{$pkg} = "${pk...@$1";
+           } else {
+               $self->{ips_pkgname_cache}->{$pkg} = "${pk...@$1-$2";
+           }
            return "${pk...@$1-$2";
        } else {
            if ($search_out eq "") {

Thanks,

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

Reply via email to