upstream/oracle/pkg-gate: changeset 1516:8c950a3b4171

--- a/src/Makefile	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/Makefile	Mon Nov 30 13:01:40 2009 -0800
@@ -28,9 +28,9 @@
 # publish.py -> /usr/bin/pkgsend
 # depot.py -> /usr/lib/pkg.depotd
 #
-# pkg/*.py -> /usr/lib/python2.4/vendor-packages/pkg/
+# pkg/*.py -> /usr/lib/python2.6/vendor-packages/pkg/
 
-PYTHON = /usr/bin/python
+PYTHON = /usr/bin/python2.6
 
 all := TARGET = all
 link := TARGET = link
@@ -79,7 +79,7 @@
 	ln -sf $(PWD)/pull.py /usr/bin/pkgrecv
 	ln -sf $(PWD)/publish.py /usr/bin/pkgsend
 	ln -sf $(PWD)/depot.py /usr/lib/pkg.depotd
-	ln -sf $(PWD)/modules /usr/lib/python2.4/vendor-packages/pkg
+	ln -sf $(PWD)/modules /usr/lib/python2.6/vendor-packages/pkg
 	ln -sf $(PWD)/pkg-server.xml /var/svc/manifest/application/pkg-server.xml
 	ln -sf $(PWD)/pkg-update.xml /var/svc/manifest/application/pkg-update.xml
 	@cd web; pwd; $(MAKE) $(TARGET)
@@ -93,7 +93,7 @@
 	rm -f /usr/bin/pkgrecv
 	rm -f /usr/bin/pkgsend
 	rm -f /usr/lib/pkg.depotd
-	rm -f /usr/lib/python2.4/vendor-packages/pkg
+	rm -f /usr/lib/python2.6/vendor-packages/pkg
 	rm -f /var/svc/manifest/application/pkg-server.xml
 	rm -f /var/svc/manifest/application/pkg-update.xml
 	@cd web; pwd; $(MAKE) $(TARGET)

--- a/src/brand/fmri_compare.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/brand/fmri_compare.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python2.6
 #
 # CDDL HEADER START
 #

--- a/src/brand/pkgcreatezone	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/brand/pkgcreatezone	Mon Nov 30 13:01:40 2009 -0800
@@ -474,7 +474,7 @@
 #
 # Workaround: For now, SUNWipkg has no dependency on python, so we supply it.
 #
-pkglist="$pkglist SUNWPython SUNWipkg"
+pkglist="$pkglist SUNWPython26 SUNWipkg"
 
 #
 # Get some diagnostic tools, truss, dtrace, etc.

--- a/src/checkforupdates.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/checkforupdates.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4 
+#!/usr/bin/python2.6
 # 
 # CDDL HEADER START 
 #

--- a/src/client.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/client.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python2.6
 #
 # CDDL HEADER START
 #

--- a/src/depot.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/depot.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python2.6
 #
 # CDDL HEADER START
 #

--- a/src/gui/Makefile	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/gui/Makefile	Mon Nov 30 13:01:40 2009 -0800
@@ -25,7 +25,7 @@
 MACH:sh = uname -p
 
 KSH=/usr/bin/ksh
-PYTHON = /usr/bin/python
+PYTHON = /usr/bin/python2.6
 INSTALL = /usr/sbin/install -s
 
 ROOT = ../../proto/root_${MACH}/usr
@@ -47,7 +47,7 @@
 ROOTICON48SHARE = $(ROOTSHARE)/icons/hicolor/48x48/actions
 ROOTMIMEICONSHARE = $(ROOT)/share/icons/hicolor/48x48/mimetypes
 ROOTMIMETYPESHARE = $(ROOT)/share/mime/packages
-ROOTPYTHON = $(ROOTUSRLIB)/python2.4
+ROOTPYTHON = $(ROOTUSRLIB)/python2.6
 ROOTPYTHONPKG = $(ROOTPYTHONVENDOR)/pkg/gui
 ROOTPYTHONVENDOR = $(ROOTPYTHON)/vendor-packages
 ROOTSPSHARE = $(ROOTSHARE)/data/startpagebase
@@ -316,11 +316,11 @@
 	ln -sf $(PWD)/data/icons /usr/share/package-manager/icons/hicolor
 	ln -sf $(PWD)/data/icons/48x48/packagemanager.png /usr/share/icons/hicolor/48x48/apps/packagemanager.png
 	ln -sf $(PWD)/data/icons/HighContrast/48x48/packagemanager.png /usr/share/icons/HighContrast/48x48/apps/packagemanager.png
-	ln -sf $(PWD)/modules /usr/lib/python2.4/vendor-packages/pkg/gui
+	ln -sf $(PWD)/modules /usr/lib/python2.6/vendor-packages/pkg/gui
 
 link-clean:
 	rm -rf /usr/share/lib/package-manager
-	rm -rf /usr/lib/python2.4/vendor-packages/pkg/gui
+	rm -rf /usr/lib/python2.6/vendor-packages/pkg/gui
 	rm -f /usr/share/applications/packagemanager.desktop
 	rm -f /usr/share/applications/addmoresoftware.desktop
 	rm -f /usr/bin/packagemanager

--- a/src/gui/modules/__init__.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/gui/modules/__init__.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #

--- a/src/gui/modules/beadmin.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/gui/modules/beadmin.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #

--- a/src/gui/modules/cache.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/gui/modules/cache.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #

--- a/src/gui/modules/enumerations.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/gui/modules/enumerations.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #

--- a/src/gui/modules/imageinfo.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/gui/modules/imageinfo.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #

--- a/src/gui/modules/installupdate.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/gui/modules/installupdate.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #

--- a/src/gui/modules/misc.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/gui/modules/misc.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #

--- a/src/gui/modules/misc_non_gui.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/gui/modules/misc_non_gui.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #

--- a/src/gui/modules/parseqs.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/gui/modules/parseqs.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,3 +1,4 @@
+#!/usr/bin/python
 ##################################################################################
 # PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
 #     http://www.python.org/download/releases/2.6.1/license/

--- a/src/gui/modules/progress.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/gui/modules/progress.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #

--- a/src/gui/modules/repository.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/gui/modules/repository.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #

--- a/src/gui/modules/uarenamebe.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/gui/modules/uarenamebe.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #

--- a/src/gui/modules/webinstall.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/gui/modules/webinstall.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #

--- a/src/launch.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/launch.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python2.6
 #
 # CDDL HEADER START
 #

--- a/src/modules/Uuid25.py	Fri Nov 20 12:05:54 2009 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,541 +0,0 @@
-r"""UUID objects (universally unique identifiers) according to RFC 4122.
-
-This module provides immutable UUID objects (class UUID) and the functions
-uuid1(), uuid3(), uuid4(), uuid5() for generating version 1, 3, 4, and 5
-UUIDs as specified in RFC 4122.
-
-If all you want is a unique ID, you should probably call uuid1() or uuid4().
-Note that uuid1() may compromise privacy since it creates a UUID containing
-the computer's network address.  uuid4() creates a random UUID.
-
-Typical usage:
-
-    >>> import uuid
-
-    # make a UUID based on the host ID and current time
-    >>> uuid.uuid1()
-    UUID('a8098c1a-f86e-11da-bd1a-00112444be1e')
-
-    # make a UUID using an MD5 hash of a namespace UUID and a name
-    >>> uuid.uuid3(uuid.NAMESPACE_DNS, 'python.org')
-    UUID('6fa459ea-ee8a-3ca4-894e-db77e160355e')
-
-    # make a random UUID
-    >>> uuid.uuid4()
-    UUID('16fd2706-8baf-433b-82eb-8c7fada847da')
-
-    # make a UUID using a SHA-1 hash of a namespace UUID and a name
-    >>> uuid.uuid5(uuid.NAMESPACE_DNS, 'python.org')
-    UUID('886313e1-3b8a-5372-9b90-0c9aee199e5d')
-
-    # make a UUID from a string of hex digits (braces and hyphens ignored)
-    >>> x = uuid.UUID('{00010203-0405-0607-0809-0a0b0c0d0e0f}')
-
-    # convert a UUID to a string of hex digits in standard form
-    >>> str(x)
-    '00010203-0405-0607-0809-0a0b0c0d0e0f'
-
-    # get the raw 16 bytes of the UUID
-    >>> x.bytes
-    '\x00\x01\x02\x03\x04\x05\x06\x07\x08\t\n\x0b\x0c\r\x0e\x0f'
-
-    # make a UUID from a 16-byte string
-    >>> uuid.UUID(bytes=x.bytes)
-    UUID('00010203-0405-0607-0809-0a0b0c0d0e0f')
-"""
-
-__author__ = 'Ka-Ping Yee <[email protected]>'
-
-RESERVED_NCS, RFC_4122, RESERVED_MICROSOFT, RESERVED_FUTURE = [
-    'reserved for NCS compatibility', 'specified in RFC 4122',
-    'reserved for Microsoft compatibility', 'reserved for future definition']
-
-class UUID(object):
-    """Instances of the UUID class represent UUIDs as specified in RFC 4122.
-    UUID objects are immutable, hashable, and usable as dictionary keys.
-    Converting a UUID to a string with str() yields something in the form
-    '12345678-1234-1234-1234-123456789abc'.  The UUID constructor accepts
-    five possible forms: a similar string of hexadecimal digits, or a tuple
-    of six integer fields (with 32-bit, 16-bit, 16-bit, 8-bit, 8-bit, and
-    48-bit values respectively) as an argument named 'fields', or a string
-    of 16 bytes (with all the integer fields in big-endian order) as an
-    argument named 'bytes', or a string of 16 bytes (with the first three
-    fields in little-endian order) as an argument named 'bytes_le', or a
-    single 128-bit integer as an argument named 'int'.
-
-    UUIDs have these read-only attributes:
-
-        bytes       the UUID as a 16-byte string (containing the six
-                    integer fields in big-endian byte order)
-
-        bytes_le    the UUID as a 16-byte string (with time_low, time_mid,
-                    and time_hi_version in little-endian byte order)
-
-        fields      a tuple of the six integer fields of the UUID,
-                    which are also available as six individual attributes
-                    and two derived attributes:
-
-            time_low                the first 32 bits of the UUID
-            time_mid                the next 16 bits of the UUID
-            time_hi_version         the next 16 bits of the UUID
-            clock_seq_hi_variant    the next 8 bits of the UUID
-            clock_seq_low           the next 8 bits of the UUID
-            node                    the last 48 bits of the UUID
-
-            time                    the 60-bit timestamp
-            clock_seq               the 14-bit sequence number
-
-        hex         the UUID as a 32-character hexadecimal string
-
-        int         the UUID as a 128-bit integer
-
-        urn         the UUID as a URN as specified in RFC 4122
-
-        variant     the UUID variant (one of the constants RESERVED_NCS,
-                    RFC_4122, RESERVED_MICROSOFT, or RESERVED_FUTURE)
-
-        version     the UUID version number (1 through 5, meaningful only
-                    when the variant is RFC_4122)
-    """
-
-    def __init__(self, hex=None, bytes=None, bytes_le=None, fields=None,
-                       int=None, version=None):
-        r"""Create a UUID from either a string of 32 hexadecimal digits,
-        a string of 16 bytes as the 'bytes' argument, a string of 16 bytes
-        in little-endian order as the 'bytes_le' argument, a tuple of six
-        integers (32-bit time_low, 16-bit time_mid, 16-bit time_hi_version,
-        8-bit clock_seq_hi_variant, 8-bit clock_seq_low, 48-bit node) as
-        the 'fields' argument, or a single 128-bit integer as the 'int'
-        argument.  When a string of hex digits is given, curly braces,
-        hyphens, and a URN prefix are all optional.  For example, these
-        expressions all yield the same UUID:
-
-        UUID('{12345678-1234-5678-1234-567812345678}')
-        UUID('12345678123456781234567812345678')
-        UUID('urn:uuid:12345678-1234-5678-1234-567812345678')
-        UUID(bytes='\x12\x34\x56\x78'*4)
-        UUID(bytes_le='\x78\x56\x34\x12\x34\x12\x78\x56' +
-                      '\x12\x34\x56\x78\x12\x34\x56\x78')
-        UUID(fields=(0x12345678, 0x1234, 0x5678, 0x12, 0x34, 0x567812345678))
-        UUID(int=0x12345678123456781234567812345678)
-
-        Exactly one of 'hex', 'bytes', 'bytes_le', 'fields', or 'int' must
-        be given.  The 'version' argument is optional; if given, the resulting
-        UUID will have its variant and version set according to RFC 4122,
-        overriding the given 'hex', 'bytes', 'bytes_le', 'fields', or 'int'.
-        """
-
-        if [hex, bytes, bytes_le, fields, int].count(None) != 4:
-            raise TypeError('need one of hex, bytes, bytes_le, fields, or int')
-        if hex is not None:
-            hex = hex.replace('urn:', '').replace('uuid:', '')
-            hex = hex.strip('{}').replace('-', '')
-            if len(hex) != 32:
-                raise ValueError('badly formed hexadecimal UUID string')
-            int = long(hex, 16)
-        if bytes_le is not None:
-            if len(bytes_le) != 16:
-                raise ValueError('bytes_le is not a 16-char string')
-            bytes = (bytes_le[3] + bytes_le[2] + bytes_le[1] + bytes_le[0] +
-                     bytes_le[5] + bytes_le[4] + bytes_le[7] + bytes_le[6] +
-                     bytes_le[8:])
-        if bytes is not None:
-            if len(bytes) != 16:
-                raise ValueError('bytes is not a 16-char string')
-            int = long(('%02x'*16) % tuple(map(ord, bytes)), 16)
-        if fields is not None:
-            if len(fields) != 6:
-                raise ValueError('fields is not a 6-tuple')
-            (time_low, time_mid, time_hi_version,
-             clock_seq_hi_variant, clock_seq_low, node) = fields
-            if not 0 <= time_low < 1<<32L:
-                raise ValueError('field 1 out of range (need a 32-bit value)')
-            if not 0 <= time_mid < 1<<16L:
-                raise ValueError('field 2 out of range (need a 16-bit value)')
-            if not 0 <= time_hi_version < 1<<16L:
-                raise ValueError('field 3 out of range (need a 16-bit value)')
-            if not 0 <= clock_seq_hi_variant < 1<<8L:
-                raise ValueError('field 4 out of range (need an 8-bit value)')
-            if not 0 <= clock_seq_low < 1<<8L:
-                raise ValueError('field 5 out of range (need an 8-bit value)')
-            if not 0 <= node < 1<<48L:
-                raise ValueError('field 6 out of range (need a 48-bit value)')
-            clock_seq = (clock_seq_hi_variant << 8L) | clock_seq_low
-            int = ((time_low << 96L) | (time_mid << 80L) |
-                   (time_hi_version << 64L) | (clock_seq << 48L) | node)
-        if int is not None:
-            if not 0 <= int < 1<<128L:
-                raise ValueError('int is out of range (need a 128-bit value)')
-        if version is not None:
-            if not 1 <= version <= 5:
-                raise ValueError('illegal version number')
-            # Set the variant to RFC 4122.
-            int &= ~(0xc000 << 48L)
-            int |= 0x8000 << 48L
-            # Set the version number.
-            int &= ~(0xf000 << 64L)
-            int |= version << 76L
-        self.__dict__['int'] = int
-
-    def __cmp__(self, other):
-        if isinstance(other, UUID):
-            return cmp(self.int, other.int)
-        return NotImplemented
-
-    def __hash__(self):
-        return hash(self.int)
-
-    def __int__(self):
-        return self.int
-
-    def __repr__(self):
-        return 'UUID(%r)' % str(self)
-
-    def __setattr__(self, name, value):
-        raise TypeError('UUID objects are immutable')
-
-    def __str__(self):
-        hex = '%032x' % self.int
-        return '%s-%s-%s-%s-%s' % (
-            hex[:8], hex[8:12], hex[12:16], hex[16:20], hex[20:])
-
-    def get_bytes(self):
-        bytes = ''
-        for shift in range(0, 128, 8):
-            bytes = chr((self.int >> shift) & 0xff) + bytes
-        return bytes
-
-    bytes = property(get_bytes)
-
-    def get_bytes_le(self):
-        bytes = self.bytes
-        return (bytes[3] + bytes[2] + bytes[1] + bytes[0] +
-                bytes[5] + bytes[4] + bytes[7] + bytes[6] + bytes[8:])
-
-    bytes_le = property(get_bytes_le)
-
-    def get_fields(self):
-        return (self.time_low, self.time_mid, self.time_hi_version,
-                self.clock_seq_hi_variant, self.clock_seq_low, self.node)
-
-    fields = property(get_fields)
-
-    def get_time_low(self):
-        return self.int >> 96L
-
-    time_low = property(get_time_low)
-
-    def get_time_mid(self):
-        return (self.int >> 80L) & 0xffff
-
-    time_mid = property(get_time_mid)
-
-    def get_time_hi_version(self):
-        return (self.int >> 64L) & 0xffff
-
-    time_hi_version = property(get_time_hi_version)
-
-    def get_clock_seq_hi_variant(self):
-        return (self.int >> 56L) & 0xff
-
-    clock_seq_hi_variant = property(get_clock_seq_hi_variant)
-
-    def get_clock_seq_low(self):
-        return (self.int >> 48L) & 0xff
-
-    clock_seq_low = property(get_clock_seq_low)
-
-    def get_time(self):
-        return (((self.time_hi_version & 0x0fffL) << 48L) |
-                (self.time_mid << 32L) | self.time_low)
-
-    time = property(get_time)
-
-    def get_clock_seq(self):
-        return (((self.clock_seq_hi_variant & 0x3fL) << 8L) |
-                self.clock_seq_low)
-
-    clock_seq = property(get_clock_seq)
-
-    def get_node(self):
-        return self.int & 0xffffffffffff
-
-    node = property(get_node)
-
-    def get_hex(self):
-        return '%032x' % self.int
-
-    hex = property(get_hex)
-
-    def get_urn(self):
-        return 'urn:uuid:' + str(self)
-
-    urn = property(get_urn)
-
-    def get_variant(self):
-        if not self.int & (0x8000 << 48L):
-            return RESERVED_NCS
-        elif not self.int & (0x4000 << 48L):
-            return RFC_4122
-        elif not self.int & (0x2000 << 48L):
-            return RESERVED_MICROSOFT
-        else:
-            return RESERVED_FUTURE
-
-    variant = property(get_variant)
-
-    def get_version(self):
-        # The version bits are only meaningful for RFC 4122 UUIDs.
-        if self.variant == RFC_4122:
-            return int((self.int >> 76L) & 0xf)
-
-    version = property(get_version)
-
-def _find_mac(command, args, hw_identifiers, get_index):
-    import os
-    for dir in ['', '/sbin/', '/usr/sbin']:
-        executable = os.path.join(dir, command)
-        if not os.path.exists(executable):
-            continue
-
-        try:
-            # LC_ALL to get English output, 2>/dev/null to
-            # prevent output on stderr
-            cmd = 'LC_ALL=C %s %s 2>/dev/null' % (executable, args)
-            pipe = os.popen(cmd)
-        except IOError:
-            continue
-
-        for line in pipe:
-            words = line.lower().split()
-            for i in range(len(words)):
-                if words[i] in hw_identifiers:
-                    return int(words[get_index(i)].replace(':', ''), 16)
-    return None
-
-def _ifconfig_getnode():
-    """Get the hardware address on Unix by running ifconfig."""
-
-    # This works on Linux ('' or '-a'), Tru64 ('-av'), but not all Unixes.
-    for args in ('', '-a', '-av'):
-        mac = _find_mac('ifconfig', args, ['hwaddr', 'ether'], lambda i: i+1)
-        if mac:
-            return mac
-
-    import socket
-    ip_addr = socket.gethostbyname(socket.gethostname())
-
-    # Try getting the MAC addr from arp based on our IP address (Solaris).
-    mac = _find_mac('arp', '-an', [ip_addr], lambda i: -1)
-    if mac:
-        return mac
-
-    # This might work on HP-UX.
-    mac = _find_mac('lanscan', '-ai', ['lan0'], lambda i: 0)
-    if mac:
-        return mac
-
-    return None
-
-def _ipconfig_getnode():
-    """Get the hardware address on Windows by running ipconfig.exe."""
-    import os, re
-    dirs = ['', r'c:\windows\system32', r'c:\winnt\system32']
-    try:
-        import ctypes
-        buffer = ctypes.create_string_buffer(300)
-        ctypes.windll.kernel32.GetSystemDirectoryA(buffer, 300)
-        dirs.insert(0, buffer.value.decode('mbcs'))
-    except:
-        pass
-    for dir in dirs:
-        try:
-            pipe = os.popen(os.path.join(dir, 'ipconfig') + ' /all')
-        except IOError:
-            continue
-        for line in pipe:
-            value = line.split(':')[-1].strip().lower()
-            if re.match('([0-9a-f][0-9a-f]-){5}[0-9a-f][0-9a-f]', value):
-                return int(value.replace('-', ''), 16)
-
-def _netbios_getnode():
-    """Get the hardware address on Windows using NetBIOS calls.
-    See http://support.microsoft.com/kb/118623 for details."""
-    import win32wnet, netbios
-    ncb = netbios.NCB()
-    ncb.Command = netbios.NCBENUM
-    ncb.Buffer = adapters = netbios.LANA_ENUM()
-    adapters._pack()
-    if win32wnet.Netbios(ncb) != 0:
-        return
-    adapters._unpack()
-    for i in range(adapters.length):
-        ncb.Reset()
-        ncb.Command = netbios.NCBRESET
-        ncb.Lana_num = ord(adapters.lana[i])
-        if win32wnet.Netbios(ncb) != 0:
-            continue
-        ncb.Reset()
-        ncb.Command = netbios.NCBASTAT
-        ncb.Lana_num = ord(adapters.lana[i])
-        ncb.Callname = '*'.ljust(16)
-        ncb.Buffer = status = netbios.ADAPTER_STATUS()
-        if win32wnet.Netbios(ncb) != 0:
-            continue
-        status._unpack()
-        bytes = map(ord, status.adapter_address)
-        return ((bytes[0]<<40L) + (bytes[1]<<32L) + (bytes[2]<<24L) +
-                (bytes[3]<<16L) + (bytes[4]<<8L) + bytes[5])
-
-# Thanks to Thomas Heller for ctypes and for his help with its use here.
-
-# If ctypes is available, use it to find system routines for UUID generation.
-_uuid_generate_random = _uuid_generate_time = _UuidCreate = None
-try:
-    import ctypes
-    _buffer = ctypes.create_string_buffer(16)
-
-    # The uuid_generate_* routines are provided by libuuid on at least
-    # Linux and FreeBSD, and provided by libc on Mac OS X.
-    for libname in ['/usr/lib/libuuid.so', '/usr/lib/libc.so']:
-        try:
-            lib = ctypes.CDLL(libname)
-        except:
-            continue
-        if hasattr(lib, 'uuid_generate_random'):
-            _uuid_generate_random = lib.uuid_generate_random
-        if hasattr(lib, 'uuid_generate_time'):
-            _uuid_generate_time = lib.uuid_generate_time
-
-    # On Windows prior to 2000, UuidCreate gives a UUID containing the
-    # hardware address.  On Windows 2000 and later, UuidCreate makes a
-    # random UUID and UuidCreateSequential gives a UUID containing the
-    # hardware address.  These routines are provided by the RPC runtime.
-    # NOTE:  at least on Tim's WinXP Pro SP2 desktop box, while the last
-    # 6 bytes returned by UuidCreateSequential are fixed, they don't appear
-    # to bear any relationship to the MAC address of any network device
-    # on the box.
-    try:
-        lib = ctypes.windll.rpcrt4
-    except:
-        lib = None
-    _UuidCreate = getattr(lib, 'UuidCreateSequential',
-                          getattr(lib, 'UuidCreate', None))
-except:
-    pass
-
-def _unixdll_getnode():
-    """Get the hardware address on Unix using ctypes."""
-    _uuid_generate_time(_buffer)
-    return UUID(bytes=_buffer.raw).node
-
-def _windll_getnode():
-    """Get the hardware address on Windows using ctypes."""
-    if _UuidCreate(_buffer) == 0:
-        return UUID(bytes=_buffer.raw).node
-
-def _random_getnode():
-    """Get a random node ID, with eighth bit set as suggested by RFC 4122."""
-    import random
-    return random.randrange(0, 1<<48L) | 0x010000000000L
-
-_node = None
-
-def getnode():
-    """Get the hardware address as a 48-bit positive integer.
-
-    The first time this runs, it may launch a separate program, which could
-    be quite slow.  If all attempts to obtain the hardware address fail, we
-    choose a random 48-bit number with its eighth bit set to 1 as recommended
-    in RFC 4122.
-    """
-
-    global _node
-    if _node is not None:
-        return _node
-
-    import sys
-    if sys.platform == 'win32':
-        getters = [_windll_getnode, _netbios_getnode, _ipconfig_getnode]
-    else:
-        getters = [_unixdll_getnode, _ifconfig_getnode]
-
-    for getter in getters + [_random_getnode]:
-        try:
-            _node = getter()
-        except:
-            continue
-        if _node is not None:
-            return _node
-
-_last_timestamp = None
-
-def uuid1(node=None, clock_seq=None):
-    """Generate a UUID from a host ID, sequence number, and the current time.
-    If 'node' is not given, getnode() is used to obtain the hardware
-    address.  If 'clock_seq' is given, it is used as the sequence number;
-    otherwise a random 14-bit sequence number is chosen."""
-
-    # When the system provides a version-1 UUID generator, use it (but don't
-    # use UuidCreate here because its UUIDs don't conform to RFC 4122).
-    if _uuid_generate_time and node is clock_seq is None:
-        _uuid_generate_time(_buffer)
-        return UUID(bytes=_buffer.raw)
-
-    global _last_timestamp
-    import time
-    nanoseconds = int(time.time() * 1e9)
-    # 0x01b21dd213814000 is the number of 100-ns intervals between the
-    # UUID epoch 1582-10-15 00:00:00 and the Unix epoch 1970-01-01 00:00:00.
-    timestamp = int(nanoseconds/100) + 0x01b21dd213814000L
-    if timestamp <= _last_timestamp:
-        timestamp = _last_timestamp + 1
-    _last_timestamp = timestamp
-    if clock_seq is None:
-        import random
-        clock_seq = random.randrange(1<<14L) # instead of stable storage
-    time_low = timestamp & 0xffffffffL
-    time_mid = (timestamp >> 32L) & 0xffffL
-    time_hi_version = (timestamp >> 48L) & 0x0fffL
-    clock_seq_low = clock_seq & 0xffL
-    clock_seq_hi_variant = (clock_seq >> 8L) & 0x3fL
-    if node is None:
-        node = getnode()
-    return UUID(fields=(time_low, time_mid, time_hi_version,
-                        clock_seq_hi_variant, clock_seq_low, node), version=1)
-
-def uuid3(namespace, name):
-    """Generate a UUID from the MD5 hash of a namespace UUID and a name."""
-    import md5
-    hash = md5.md5(namespace.bytes + name).digest()
-    return UUID(bytes=hash[:16], version=3)
-
-def uuid4():
-    """Generate a random UUID."""
-
-    # When the system provides a version-4 UUID generator, use it.
-    if _uuid_generate_random:
-        _uuid_generate_random(_buffer)
-        return UUID(bytes=_buffer.raw)
-
-    # Otherwise, get randomness from urandom or the 'random' module.
-    try:
-        import os
-        return UUID(bytes=os.urandom(16), version=4)
-    except:
-        import random
-        bytes = [chr(random.randrange(256)) for i in range(16)]
-        return UUID(bytes=bytes, version=4)
-
-def uuid5(namespace, name):
-    """Generate a UUID from the SHA-1 hash of a namespace UUID and a name."""
-    import sha
-    hash = sha.sha(namespace.bytes + name).digest()
-    return UUID(bytes=hash[:16], version=5)
-
-# The following standard UUIDs are for use with uuid3() or uuid5().
-
-NAMESPACE_DNS = UUID('6ba7b810-9dad-11d1-80b4-00c04fd430c8')
-NAMESPACE_URL = UUID('6ba7b811-9dad-11d1-80b4-00c04fd430c8')
-NAMESPACE_OID = UUID('6ba7b812-9dad-11d1-80b4-00c04fd430c8')
-NAMESPACE_X500 = UUID('6ba7b814-9dad-11d1-80b4-00c04fd430c8')

--- a/src/modules/__init__.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/modules/__init__.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #

--- a/src/modules/actions/__init__.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/modules/actions/__init__.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #

--- a/src/modules/actions/attribute.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/modules/actions/attribute.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #

--- a/src/modules/actions/depend.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/modules/actions/depend.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #

--- a/src/modules/actions/directory.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/modules/actions/directory.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #

--- a/src/modules/actions/driver.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/modules/actions/driver.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #

--- a/src/modules/actions/file.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/modules/actions/file.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #

--- a/src/modules/actions/generic.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/modules/actions/generic.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #

--- a/src/modules/actions/group.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/modules/actions/group.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #

--- a/src/modules/actions/hardlink.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/modules/actions/hardlink.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #

--- a/src/modules/actions/legacy.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/modules/actions/legacy.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #

--- a/src/modules/actions/license.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/modules/actions/license.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #

--- a/src/modules/actions/link.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/modules/actions/link.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #

--- a/src/modules/actions/signature.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/modules/actions/signature.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python2.6
 #
 # CDDL HEADER START
 #

--- a/src/modules/actions/unknown.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/modules/actions/unknown.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #

--- a/src/modules/actions/user.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/modules/actions/user.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #

--- a/src/modules/bundle/DirectoryBundle.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/modules/bundle/DirectoryBundle.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #

--- a/src/modules/bundle/SolarisPackageDatastreamBundle.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/modules/bundle/SolarisPackageDatastreamBundle.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #

--- a/src/modules/bundle/SolarisPackageDirBundle.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/modules/bundle/SolarisPackageDirBundle.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #

--- a/src/modules/bundle/TarBundle.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/modules/bundle/TarBundle.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #

--- a/src/modules/bundle/__init__.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/modules/bundle/__init__.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #

--- a/src/modules/catalog.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/modules/catalog.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #
@@ -29,13 +29,13 @@
 import calendar
 import datetime
 import errno
+import hashlib
 import os
 try:
         # Some versions of python don't have these constants.
         os.SEEK_SET
 except AttributeError:
         os.SEEK_SET, os.SEEK_CUR, os.SEEK_END = range(3)
-import sha
 import simplejson as json
 import stat
 import statvfs
@@ -65,7 +65,7 @@
                 if sign:
                         if not pathname:
                                 # Only needed if not writing to __fileobj.
-                                self.__sha_1 = sha.new()
+                                self.__sha_1 = hashlib.sha1()
                         self.__sha_1_value = None
 
                 self.__sign = sign

--- a/src/modules/cfgfiles.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/modules/cfgfiles.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #

--- a/src/modules/choose.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/modules/choose.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,3 +1,4 @@
+#!/usr/bin/python
 # Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Python Software
 # Foundation; All Rights Reserved
 #

--- a/src/modules/client/__init__.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/modules/client/__init__.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #

--- a/src/modules/client/actuator.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/modules/client/actuator.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #

--- a/src/modules/client/api.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/modules/client/api.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #

--- a/src/modules/client/api_errors.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/modules/client/api_errors.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #
@@ -298,7 +298,7 @@
                         self.data = args[0]
                 else:
                         self.data = None
-                self.args = kwargs
+                self._args = kwargs
 
         def __str__(self):
                 return str(self.data)
@@ -320,7 +320,7 @@
         def __str__(self):
                 return _("Catalog meta_root '%(root)s' is invalid; unable "
                     "to complete operation: '%(op)s'.") % { "root": self.data,
-                    "op": self.args.get("operation", None) }
+                    "op": self._args.get("operation", None) }
 
 
 class BadCatalogPermissions(CatalogError):
@@ -337,7 +337,7 @@
         def __str__(self):
                 msg = _("The following catalog files have incorrect "
                     "permissions:\n")
-                for f in self.args:
+                for f in self._args:
                         fname, emode, fmode = f
                         msg += _("\t%(fname)s: expected mode: %(emode)s, found "
                             "mode: %(fmode)s\n") % { "fname": fname,
@@ -371,8 +371,8 @@
         def __str__(self):
                 return _("Unable to perform '%(op)s' operation for catalog "
                     "%(name)s; completion would result in a duplicate entry "
-                    "for package '%(fmri)s'.") % { "op": self.args.get(
-                    "operation", None), "name": self.args.get("catalog_name",
+                    "for package '%(fmri)s'.") % { "op": self._args.get(
+                    "operation", None), "name": self._args.get("catalog_name",
                     None), "fmri": self.data }
 
 
@@ -695,7 +695,7 @@
                         self.data = args[0]
                 else:
                         self.data = None
-                self.args = kwargs
+                self._args = kwargs
 
 
 class InvalidP5IFile(DataError):
@@ -859,7 +859,7 @@
                         self.data = args[0]
                 else:
                         self.data = None
-                self.args = kwargs
+                self._args = kwargs
 
         def __str__(self):
                 return str(self.data)
@@ -872,7 +872,7 @@
         def __str__(self):
                 return _("Publisher meta_root '%(root)s' is invalid; unable "
                     "to complete operation: '%(op)s'.") % { "root": self.data,
-                    "op": self.args.get("operation", None) }
+                    "op": self._args.get("operation", None) }
 
 
 class BadPublisherPrefix(PublisherError):
@@ -889,7 +889,7 @@
         def __str__(self):
                 return _("'%(value)s' is not a valid value for repository "
                     "attribute '%(attribute)s'.") % {
-                    "value": self.args["value"], "attribute": self.data }
+                    "value": self._args["value"], "attribute": self.data }
 
 
 class BadRepositoryCollectionType(PublisherError):
@@ -1112,7 +1112,7 @@
 
         def __str__(self):
                 return _("'%(attr)s' is not supported for '%(scheme)s'.") % {
-                    "attr": self.data, "scheme": self.args["scheme"] }
+                    "attr": self.data, "scheme": self._args["scheme"] }
 
 
 class CertificateError(ApiException):
@@ -1124,7 +1124,7 @@
                         self.data = args[0]
                 else:
                         self.data = None
-                self.args = kwargs
+                self._args = kwargs
 
         def __str__(self):
                 return str(self.data)
@@ -1134,8 +1134,8 @@
         """Used to indicate that a certificate has expired."""
 
         def __str__(self):
-                publisher = self.args.get("publisher", None)
-                uri = self.args.get("uri", None)
+                publisher = self._args.get("publisher", None)
+                uri = self._args.get("uri", None)
                 if publisher:
                         if uri:
                                 return _("Certificate '%(cert)s' for publisher "
@@ -1159,9 +1159,9 @@
         """Used to indicate that a certificate has expired."""
 
         def __str__(self):
-                publisher = self.args.get("publisher", None)
-                uri = self.args.get("uri", None)
-                days = self.args.get("days", 0)
+                publisher = self._args.get("publisher", None)
+                uri = self._args.get("uri", None)
+                days = self._args.get("days", 0)
                 if publisher:
                         if uri:
                                 return _("Certificate '%(cert)s' for publisher "
@@ -1184,8 +1184,8 @@
         """Used to indicate that a certificate is invalid."""
 
         def __str__(self):
-                publisher = self.args.get("publisher", None)
-                uri = self.args.get("uri", None)
+                publisher = self._args.get("publisher", None)
+                uri = self._args.get("uri", None)
                 if publisher:
                         if uri:
                                 return _("Certificate '%(cert)s' for publisher "
@@ -1206,8 +1206,8 @@
         """Used to indicate that a key could not be found."""
 
         def __str__(self):
-                publisher = self.args.get("publisher", None)
-                uri = self.args.get("uri", None)
+                publisher = self._args.get("publisher", None)
+                uri = self._args.get("uri", None)
                 if publisher:
                         if uri:
                                 return _("Unable to locate key '%(key)s' for "
@@ -1228,8 +1228,8 @@
         """Used to indicate that a certificate could not be found."""
 
         def __str__(self):
-                publisher = self.args.get("publisher", None)
-                uri = self.args.get("uri", None)
+                publisher = self._args.get("publisher", None)
+                uri = self._args.get("uri", None)
                 if publisher:
                         if uri:
                                 return _("Unable to locate certificate "
@@ -1252,8 +1252,8 @@
         effective date)."""
 
         def __str__(self):
-                publisher = self.args.get("publisher", None)
-                uri = self.args.get("uri", None)
+                publisher = self._args.get("publisher", None)
+                uri = self._args.get("uri", None)
                 if publisher:
                         if uri:
                                 return _("Certificate '%(cert)s' for publisher "
@@ -1304,7 +1304,7 @@
                         self.data = args[0]
                 else:
                         self.data = None
-                self.args = kwargs
+                self._args = kwargs
 
         def __str__(self):
                 return str(self.data)

--- a/src/modules/client/bootenv.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/modules/client/bootenv.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #

--- a/src/modules/client/debugvalues.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/modules/client/debugvalues.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #

--- a/src/modules/client/history.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/modules/client/history.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #

--- a/src/modules/client/image.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/modules/client/image.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #
@@ -36,7 +36,6 @@
 from pkg.client import global_settings
 logger = global_settings.logger
 
-import pkg.Uuid25
 import pkg.catalog
 import pkg.client.api_errors            as api_errors
 import pkg.client.history               as history

--- a/src/modules/client/imageconfig.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/modules/client/imageconfig.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #

--- a/src/modules/client/imageplan.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/modules/client/imageplan.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #

--- a/src/modules/client/imagetypes.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/modules/client/imagetypes.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #

--- a/src/modules/client/indexer.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/modules/client/indexer.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #

--- a/src/modules/client/pkgplan.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/modules/client/pkgplan.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #

--- a/src/modules/client/progress.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/modules/client/progress.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #

--- a/src/modules/client/publisher.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/modules/client/publisher.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #
@@ -43,6 +43,7 @@
 import tempfile
 import time
 import urlparse
+import uuid
 
 from pkg.client import global_settings
 logger = global_settings.logger
@@ -52,7 +53,6 @@
 import pkg.misc as misc
 import pkg.portable as portable
 import pkg.server.catalog as old_catalog
-import pkg.Uuid25
 
 # The "core" type indicates that a repository contains all of the dependencies
 # declared by packages in the repository.  It is primarily used for operating
@@ -1449,7 +1449,7 @@
         def reset_client_uuid(self):
                 """Replaces the current client_uuid with a new UUID."""
 
-                self.__client_uuid = str(pkg.Uuid25.uuid1())
+                self.__client_uuid = str(uuid.uuid1())
 
         def set_origin(self, origin):
                 """Deprecated"""

--- a/src/modules/client/query_parser.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/modules/client/query_parser.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #

--- a/src/modules/cpiofile.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/modules/cpiofile.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 # -*- coding: iso-8859-1 -*-
 #
 # Copyright (C) 2002 Lars Gustäbel <[email protected]>

--- a/src/modules/dependency.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/modules/dependency.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #

--- a/src/modules/depotcontroller.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/modules/depotcontroller.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #

--- a/src/modules/file_layout/__init__.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/modules/file_layout/__init__.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #

--- a/src/modules/file_layout/layout.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/modules/file_layout/layout.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #

--- a/src/modules/flavor/__init__.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/modules/flavor/__init__.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #

--- a/src/modules/flavor/base.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/modules/flavor/base.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #

--- a/src/modules/flavor/depthlimitedmf.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/modules/flavor/depthlimitedmf.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,3 +1,4 @@
+#!/usr/bin/python
 # Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Python
 # Software Foundation; All Rights Reserved
 #
@@ -68,12 +69,13 @@
                 self.depth = depth
                 modulefinder.ModuleFinder.run_script(self, pathname)
 
-        def load_module(self, fqname, fp, pathname, (suffix, mode, type)):
+        def load_module(self, fqname, fp, pathname, file_info):
                 """This code has been slightly modified from the function of
                 the parent class. Specifically, it checks the current depth
                 of the loading and halts if it exceeds the depth that was given
                 to run_script."""
 
+                suffix, mode, type = file_info
                 self.msgin(2, "load_module", fqname, fp and "fp", pathname)
                 if type == imp.PKG_DIRECTORY:
                         m = self.load_package(fqname, pathname)

--- a/src/modules/flavor/elf.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/modules/flavor/elf.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #

--- a/src/modules/flavor/hardlink.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/modules/flavor/hardlink.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #

--- a/src/modules/flavor/python.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/modules/flavor/python.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #

--- a/src/modules/flavor/script.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/modules/flavor/script.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #

--- a/src/modules/fmri.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/modules/fmri.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #

--- a/src/modules/indexer.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/modules/indexer.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #

--- a/src/modules/manifest.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/modules/manifest.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #
@@ -27,8 +27,8 @@
 
 import os
 import errno
+import hashlib
 import tempfile
-import sha
 from itertools import groupby, chain, repeat
 
 import pkg.actions as actions
@@ -494,7 +494,7 @@
                 """This method takes a string representing the on-disk
                 manifest content, and returns a hash value."""
 
-                sha_1 = sha.new()
+                sha_1 = hashlib.sha1()
                 sha_1.update(mfstcontent)
 
                 return sha_1.hexdigest()

--- a/src/modules/misc.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/modules/misc.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #
@@ -27,6 +27,7 @@
 import cStringIO
 import datetime
 import errno
+import hashlib
 import httplib
 import locale
 import OpenSSL.crypto as osc
@@ -37,7 +38,6 @@
 import pkg.urlhelpers as urlhelpers
 import platform
 import re
-import sha
 import shutil
 import socket
 import stat
@@ -302,7 +302,7 @@
         if flag & FHCRC:
                 gz.read(2)
 
-        shasum = sha.new()
+        shasum = hashlib.sha1()
         dcobj = zlib.decompressobj(-zlib.MAX_WBITS)
 
         while True:
@@ -322,7 +322,7 @@
         """ Pipe exception. """
 
         def __init__(self, args=None):
-                self.args = args
+                self._args = args
 
 def msg(*text):
         """ Emit a message. """
@@ -563,7 +563,7 @@
         # Read the data in chunks and compute the SHA1 hash as it comes in.  A
         # large read on some platforms (e.g. Windows XP) may fail.
         content = cStringIO.StringIO()
-        fhash = sha.new()
+        fhash = hashlib.sha1()
         while length > 0:
                 data = f.read(min(bufsz, length))
                 if return_content:
@@ -622,7 +622,7 @@
 class CfgCacheError(Exception):
         """Thrown when there are errors with the cfg cache."""
         def __init__(self, args=None):
-                self.args = args
+                self._args = args
 
 # ImmutableDict and EmptyI for argument defaults
 EmptyI = tuple()

--- a/src/modules/nrlock.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/modules/nrlock.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,3 +1,4 @@
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #

--- a/src/modules/p5i.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/modules/p5i.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #

--- a/src/modules/pkgtarfile.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/modules/pkgtarfile.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #

--- a/src/modules/portable/__init__.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/modules/portable/__init__.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #

--- a/src/modules/portable/os_aix.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/modules/portable/os_aix.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #

--- a/src/modules/portable/os_darwin.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/modules/portable/os_darwin.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #

--- a/src/modules/portable/os_sunos.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/modules/portable/os_sunos.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #

--- a/src/modules/portable/os_unix.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/modules/portable/os_unix.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #

--- a/src/modules/portable/os_windows.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/modules/portable/os_windows.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #

--- a/src/modules/portable/util.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/modules/portable/util.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #

--- a/src/modules/publish/__init__.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/modules/publish/__init__.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #

--- a/src/modules/publish/dependencies.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/modules/publish/dependencies.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #

--- a/src/modules/publish/transaction.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/modules/publish/transaction.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #
@@ -30,6 +30,7 @@
 
 import httplib
 import os
+import StringIO
 import urllib
 import urllib2
 import urlparse
@@ -46,7 +47,7 @@
                 Exception.__init__(self, *args)
                 if args:
                         self.data = args[0]
-                self.args = kwargs
+                self._args = kwargs
 
         def __str__(self):
                 return str(self.data)
@@ -67,14 +68,14 @@
                 TransactionError.__init__(self, *args, **kwargs)
 
         def __str__(self):
-                if "scheme" in self.args:
+                if "scheme" in self._args:
                         return _("Unsupported scheme '%(scheme)s' in URL: "
-                            "'%(url)s'.") % { "scheme": self.args["scheme"],
+                            "'%(url)s'.") % { "scheme": self._args["scheme"],
                             "url": self.data }
-                elif "netloc" in self.args:
+                elif "netloc" in self._args:
                         return _("Malformed URL: '%s'.") % self.data
                 return _("Invalid repository URL: '%(url)s': %(msg)s") % {
-                    "url": self.data, "msg": self.args.get("msg", "") }
+                    "url": self.data, "msg": self._args.get("msg", "") }
 
 
 class TransactionOperationError(TransactionError):
@@ -84,25 +85,25 @@
         the operation that failed."""
 
         def __str__(self):
-                if "status" in self.args:
+                if "status" in self._args:
                         return _("'%(op)s' failed for transaction ID "
                             "'%(trans_id)s'; status '%(status)s': "
                             "%(msg)s") % { "op": self.data,
-                            "trans_id": self.args.get("trans_id", ""),
-                            "status": self.args["status"],
-                            "msg": self.args.get("msg", "") }
-                if "trans_id" in self.args:
+                            "trans_id": self._args.get("trans_id", ""),
+                            "status": self._args["status"],
+                            "msg": self._args.get("msg", "") }
+                if "trans_id" in self._args:
                         return _("'%(op)s' failed for transaction ID "
                             "'%(trans_id)s': %(msg)s") % { "op": self.data,
-                            "trans_id": self.args["trans_id"],
-                            "msg": self.args.get("msg", ""),
+                            "trans_id": self._args["trans_id"],
+                            "msg": self._args.get("msg", ""),
                             }
                 if self.data:
                         return _("'%(op)s' failed; unable to initiate "
                             "transaction:\n%(msg)s") % { "op": self.data,
-                            "msg": self.args.get("msg", "") }
+                            "msg": self._args.get("msg", "") }
                 return _("Unable to initiate transaction:\n%s") % \
-                    self.args.get("msg", "")
+                    self._args.get("msg", "")
 
 
 class TransactionRepositoryInvalidError(TransactionError):
@@ -117,7 +118,7 @@
         def __str__(self):
                 return _("Unsupported operation '%(op)s' for the specified "
                     "repository type '%(type)s'.") % { "op": self.data,
-                    "type": self.args.get("type", "") }
+                    "type": self._args.get("type", "") }
 
 
 class FileTransaction(object):
@@ -260,17 +261,16 @@
                 if hasattr(e, "read") and callable(e.read):
                         # Extract the message from the server output.
                         msg = ""
-                        from xml.dom.ext.reader import HtmlLib
-                        reader = HtmlLib.Reader()
+                        from xml.dom.minidom import Document, parse
                         output = e.read()
-                        doc = reader.fromString(output)
+                        dom = parse(StringIO.StringIO(output))
 
                         paragraphs = []
-                        if not doc.isHtml():
+                        if not isinstance(dom, Document):
                                 # Assume the output was the message.
                                 msg = output
                         else:
-                                paragraphs = doc.getElementsByTagName("p")
+                                paragraphs = dom.getElementsByTagName("p")
 
                         # XXX this is specific to the depot server's current
                         # error output style.

--- a/src/modules/query_parser.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/modules/query_parser.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #

--- a/src/modules/search_errors.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/modules/search_errors.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #

--- a/src/modules/search_storage.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/modules/search_storage.py	Mon Nov 30 13:01:40 2009 -0800
@@ -28,7 +28,7 @@
 import os
 import errno
 import time
-import sha
+import hashlib
 import urllib
 
 import pkg.fmri as fmri
@@ -711,7 +711,7 @@
 class IndexStoreSetHash(IndexStoreBase):
         def __init__(self, file_name):
                 IndexStoreBase.__init__(self, file_name)
-                self.hash_val = sha.new().hexdigest()
+                self.hash_val = hashlib.sha1().hexdigest()
 
         def set_hash(self, vals):
                 """Set the has value."""
@@ -721,7 +721,7 @@
                 """Calculate the hash value of the sorted members of vals."""
                 vl = list(vals)
                 vl.sort()
-                shasum = sha.new()
+                shasum = hashlib.sha1()
                 for v in vl:
                         shasum.update(v)
                 return shasum.hexdigest()

--- a/src/modules/server/__init__.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/modules/server/__init__.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #

--- a/src/modules/server/api.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/modules/server/api.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #

--- a/src/modules/server/api_errors.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/modules/server/api_errors.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #

--- a/src/modules/server/catalog.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/modules/server/catalog.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #
@@ -54,7 +54,7 @@
 
 class CatalogException(Exception):
         def __init__(self, args=None):
-                self.args = args
+                self._args = args
 
 
 class CatalogPermissionsException(CatalogException):
@@ -71,7 +71,7 @@
         def __str__(self):
                 msg = _("The following catalog files have incorrect "
                     "permissions:\n")
-                for f in self.args:
+                for f in self._args:
                         fname, emode, fmode = f
                         msg += _("\t%(fname)s: expected mode: %(emode)s, found "
                             "mode: %(fmode)s\n") % ({ "fname": fname,

--- a/src/modules/server/depot.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/modules/server/depot.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #

--- a/src/modules/server/depotresponse.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/modules/server/depotresponse.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,3 +1,4 @@
+#!/usr/bin/python
 #
 # copyright (c) 2004-2007, cherrypy team ([email protected])
 # all rights reserved.

--- a/src/modules/server/face.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/modules/server/face.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #

--- a/src/modules/server/feed.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/modules/server/feed.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #
@@ -38,11 +38,11 @@
 import rfc822
 import time
 import urllib
+import uuid
 import xml.dom.minidom as xmini
 
 from pkg.misc import get_rel_path
 import pkg.catalog as catalog
-import pkg.Uuid25 as uuid
 
 MIME_TYPE = "application/atom+xml"
 CACHE_FILENAME = "feed.xml"

--- a/src/modules/server/query_parser.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/modules/server/query_parser.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #

--- a/src/modules/server/repository.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/modules/server/repository.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #

--- a/src/modules/server/repositoryconfig.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/modules/server/repositoryconfig.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #
@@ -25,8 +25,8 @@
 
 import ConfigParser
 import pkg.misc as misc
-import pkg.Uuid25 as uuid
 import random
+import uuid
 
 PROP_TYPE_STR = 0
 PROP_TYPE_INT = 1

--- a/src/modules/server/transaction.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/modules/server/transaction.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #
@@ -25,9 +25,9 @@
 import calendar
 import datetime
 import errno
+import hashlib
 import os
 import re
-import sha
 import shutil
 import urllib
 
@@ -76,27 +76,27 @@
                 TransactionError.__init__(self, *args)
                 if kwargs is None:
                         kwargs = {}
-                self.args = kwargs
+                self._args = kwargs
 
         def __str__(self):
-                if "client_release" in self.args:
+                if "client_release" in self._args:
                         return _("The specified client_release is invalid: "
-                            "'%s'") % self.args.get("msg", "")
-                elif "fmri_version" in self.args:
+                            "'%s'") % self._args.get("msg", "")
+                elif "fmri_version" in self._args:
                         return _("'The specified FMRI, '%s', has an invalid "
-                            "version.") % self.args.get("pfmri", "")
-                elif "valid_new_fmri" in self.args:
+                            "version.") % self._args.get("pfmri", "")
+                elif "valid_new_fmri" in self._args:
                         return _("The specified FMRI, '%s', already exists or "
-                            "has been restricted.") % self.args.get("pfmri", "")
-                elif "publisher_required" in self.args:
+                            "has been restricted.") % self._args.get("pfmri", "")
+                elif "publisher_required" in self._args:
                         return _("The specified FMRI, '%s', must include the "
                             "publisher prefix as the repository contains "
                             "package data for more than one publisher or "
                             "a default publisher has not been defined.") % \
-                            self.args.get("pfmri", "")
-                elif "pfmri" in self.args:
+                            self._args.get("pfmri", "")
+                elif "pfmri" in self._args:
                         return _("The specified FMRI, '%s', is invalid.") % \
-                            self.args["pfmri"]
+                            self._args["pfmri"]
                 return str(self.data)
 
 
@@ -401,7 +401,7 @@
                         # header, allowing us to generate deterministic
                         # hashes for different files with identical content.
                         cfile = open(opath, "rb")
-                        chash = sha.new()
+                        chash = hashlib.sha1()
                         while True:
                                 cdata = cfile.read(bufsz)
                                 if cdata == "":

--- a/src/modules/smf.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/modules/smf.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #

--- a/src/modules/sysvpkg.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/modules/sysvpkg.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #

--- a/src/modules/updatelog.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/modules/updatelog.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #
@@ -45,7 +45,7 @@
 
 class UpdateLogException(Exception):
         def __init__(self, args=None):
-                self.args = args
+                self._args = args
 
 class UpdateLog(object):
         """The update log is a mechanism that allows clients and servers to

--- a/src/modules/urlhelpers.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/modules/urlhelpers.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,3 +1,4 @@
+#!/usr/bin/python
 # Additional classes to supplement functionality in urllib2
 
 import urllib2

--- a/src/modules/variant.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/modules/variant.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #

--- a/src/modules/version.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/modules/version.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #

--- a/src/packagemanager.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/packagemanager.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python2.6
 #
 # CDDL HEADER START
 #

--- a/src/patch/ldtp/find-python-path.patch	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/patch/ldtp/find-python-path.patch	Mon Nov 30 13:01:40 2009 -0800
@@ -1,5 +1,11 @@
 --- find-python-path.py.orig	2009-09-30 13:52:05.871915809 +0100
 +++ find-python-path.py	2009-09-30 13:52:18.469972626 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python2.6
+ 
+ import sys
+ from os.path import split, basename
 @@ -7,7 +7,7 @@
      for path in sys.path:
  	(head, tail) = split (path)

--- a/src/pkgdefs/SUNWipkg-gui-data/prototype	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/pkgdefs/SUNWipkg-gui-data/prototype	Mon Nov 30 13:01:40 2009 -0800
@@ -1,5 +1,8 @@
 i pkginfo
 i copyright
+d none usr 755 root sys
+d none usr/share 755 root sys
+d none usr/share/package-manager 755 root bin
 d none usr/share/package-manager/data 755 root bin
 f none usr/share/package-manager/data/opensolaris.org 444 root bin
 f none usr/share/package-manager/data/opensolaris.org.sections 444 root bin

--- a/src/pkgdefs/SUNWipkg-gui-l10n/prototype	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/pkgdefs/SUNWipkg-gui-l10n/prototype	Mon Nov 30 13:01:40 2009 -0800
@@ -1,5 +1,6 @@
 i pkginfo
 i copyright
+d none usr 755 root sys
 d none usr/share 755 root sys
 d none usr/share/gnome 755 root other
 d none usr/share/gnome/help 755 root bin

--- a/src/pkgdefs/SUNWipkg-gui/prototype	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/pkgdefs/SUNWipkg-gui/prototype	Mon Nov 30 13:01:40 2009 -0800
@@ -10,36 +10,36 @@
 d none usr/lib 755 root bin
 f none usr/lib/pm-checkforupdates 755 root bin
 f none usr/lib/pm-launch 755 root bin
-d none usr/lib/python2.4 755 root bin
-d none usr/lib/python2.4/vendor-packages 755 root bin
-d none usr/lib/python2.4/vendor-packages/pkg 755 root bin
-d none usr/lib/python2.4/vendor-packages/pkg/gui 755 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/gui/__init__.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/gui/__init__.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/gui/beadmin.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/gui/beadmin.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/gui/cache.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/gui/cache.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/gui/enumerations.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/gui/enumerations.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/gui/imageinfo.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/gui/imageinfo.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/gui/installupdate.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/gui/installupdate.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/gui/misc.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/gui/misc.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/gui/misc_non_gui.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/gui/misc_non_gui.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/gui/parseqs.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/gui/parseqs.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/gui/progress.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/gui/progress.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/gui/repository.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/gui/repository.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/gui/uarenamebe.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/gui/uarenamebe.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/gui/webinstall.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/gui/webinstall.pyc 444 root bin
+d none usr/lib/python2.6 755 root bin
+d none usr/lib/python2.6/vendor-packages 755 root bin
+d none usr/lib/python2.6/vendor-packages/pkg 755 root bin
+d none usr/lib/python2.6/vendor-packages/pkg/gui 755 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/gui/__init__.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/gui/__init__.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/gui/beadmin.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/gui/beadmin.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/gui/cache.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/gui/cache.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/gui/enumerations.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/gui/enumerations.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/gui/imageinfo.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/gui/imageinfo.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/gui/installupdate.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/gui/installupdate.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/gui/misc.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/gui/misc.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/gui/misc_non_gui.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/gui/misc_non_gui.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/gui/parseqs.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/gui/parseqs.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/gui/progress.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/gui/progress.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/gui/repository.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/gui/repository.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/gui/uarenamebe.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/gui/uarenamebe.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/gui/webinstall.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/gui/webinstall.pyc 444 root bin
 d none usr/share 755 root sys
 d none usr/share/applications 755 root other
 f none usr/share/applications/addmoresoftware.desktop 444 root other

--- a/src/pkgdefs/SUNWipkg-um/prototype	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/pkgdefs/SUNWipkg-um/prototype	Mon Nov 30 13:01:40 2009 -0800
@@ -45,4 +45,5 @@
 d none var 755 root sys
 d none var/svc 755 root sys
 d none var/svc/manifest 755 root sys
+d none var/svc/manifest/application 755 root sys
 f none var/svc/manifest/application/pkg-update.xml 444 root sys

--- a/src/pkgdefs/SUNWipkg/prototype	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/pkgdefs/SUNWipkg/prototype	Mon Nov 30 13:01:40 2009 -0800
@@ -19,230 +19,229 @@
 f none usr/bin/pkgsend 755 root bin
 d none usr/lib 755 root bin
 f none usr/lib/pkg.depotd 755 root bin
-d none usr/lib/python2.4 755 root bin
-d none usr/lib/python2.4/vendor-packages 755 root bin
-d none usr/lib/python2.4/vendor-packages/pkg 755 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/Uuid25.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/Uuid25.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/__init__.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/__init__.pyc 444 root bin
-d none usr/lib/python2.4/vendor-packages/pkg/actions 755 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/actions/__init__.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/actions/__init__.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/actions/_actions.so 755 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/actions/attribute.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/actions/attribute.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/actions/depend.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/actions/depend.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/actions/directory.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/actions/directory.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/actions/driver.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/actions/driver.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/actions/file.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/actions/file.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/actions/generic.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/actions/generic.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/actions/group.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/actions/group.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/actions/hardlink.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/actions/hardlink.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/actions/legacy.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/actions/legacy.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/actions/license.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/actions/license.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/actions/link.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/actions/link.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/actions/signature.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/actions/signature.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/actions/unknown.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/actions/unknown.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/actions/user.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/actions/user.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/arch.so 755 root bin
-d none usr/lib/python2.4/vendor-packages/pkg/bundle 755 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/bundle/DirectoryBundle.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/bundle/DirectoryBundle.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/bundle/SolarisPackageDatastreamBundle.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/bundle/SolarisPackageDatastreamBundle.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/bundle/SolarisPackageDirBundle.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/bundle/SolarisPackageDirBundle.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/bundle/TarBundle.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/bundle/TarBundle.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/bundle/__init__.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/bundle/__init__.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/catalog.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/catalog.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/cfgfiles.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/cfgfiles.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/choose.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/choose.pyc 444 root bin
-d none usr/lib/python2.4/vendor-packages/pkg/client 755 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/client/__init__.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/client/__init__.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/client/actuator.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/client/actuator.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/client/api.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/client/api.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/client/api_errors.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/client/api_errors.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/client/bootenv.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/client/bootenv.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/client/debugvalues.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/client/debugvalues.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/client/history.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/client/history.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/client/image.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/client/image.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/client/imageconfig.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/client/imageconfig.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/client/imageplan.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/client/imageplan.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/client/imagetypes.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/client/imagetypes.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/client/indexer.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/client/indexer.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/client/pkg_solver.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/client/pkg_solver.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/client/pkgplan.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/client/pkgplan.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/client/progress.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/client/progress.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/client/publisher.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/client/publisher.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/client/query_parser.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/client/query_parser.pyc 444 root bin
-d none usr/lib/python2.4/vendor-packages/pkg/client/transport 755 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/client/transport/__init__.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/client/transport/__init__.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/client/transport/engine.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/client/transport/engine.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/client/transport/exception.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/client/transport/exception.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/client/transport/fileobj.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/client/transport/fileobj.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/client/transport/repo.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/client/transport/repo.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/client/transport/stats.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/client/transport/stats.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/client/transport/transport.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/client/transport/transport.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/cpiofile.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/cpiofile.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/dependency.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/dependency.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/depotcontroller.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/depotcontroller.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/elf.so 755 root bin
-d none usr/lib/python2.4/vendor-packages/pkg/file_layout 755 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/file_layout/__init__.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/file_layout/__init__.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/file_layout/layout.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/file_layout/layout.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/file_layout/file_manager.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/file_layout/file_manager.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/facet.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/facet.pyc 444 root bin
-d none usr/lib/python2.4/vendor-packages/pkg/flavor 755 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/flavor/__init__.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/flavor/__init__.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/flavor/base.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/flavor/base.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/flavor/depthlimitedmf.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/flavor/depthlimitedmf.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/flavor/elf.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/flavor/elf.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/flavor/hardlink.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/flavor/hardlink.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/flavor/python.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/flavor/python.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/flavor/script.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/flavor/script.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/fmri.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/fmri.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/indexer.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/indexer.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/manifest.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/manifest.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/misc.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/misc.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/nrlock.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/nrlock.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/p5i.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/p5i.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/pkggzip.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/pkggzip.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/pkgsubprocess.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/pkgsubprocess.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/pkgtarfile.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/pkgtarfile.pyc 444 root bin
-d none usr/lib/python2.4/vendor-packages/pkg/portable 755 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/portable/__init__.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/portable/__init__.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/portable/os_aix.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/portable/os_aix.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/portable/os_darwin.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/portable/os_darwin.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/portable/os_sunos.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/portable/os_sunos.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/portable/os_unix.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/portable/os_unix.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/portable/os_windows.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/portable/os_windows.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/portable/util.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/portable/util.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/pspawn.so 755 root bin
-d none usr/lib/python2.4/vendor-packages/pkg/publish 755 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/publish/__init__.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/publish/__init__.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/publish/dependencies.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/publish/dependencies.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/publish/transaction.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/publish/transaction.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/query_parser.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/query_parser.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/search_errors.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/search_errors.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/search_storage.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/search_storage.pyc 444 root bin
-d none usr/lib/python2.4/vendor-packages/pkg/server 755 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/server/__init__.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/server/__init__.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/server/api.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/server/api.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/server/api_errors.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/server/api_errors.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/server/catalog.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/server/catalog.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/server/depot.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/server/depot.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/server/depotresponse.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/server/depotresponse.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/server/face.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/server/face.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/server/feed.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/server/feed.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/server/query_parser.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/server/query_parser.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/server/repository.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/server/repository.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/server/repositoryconfig.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/server/repositoryconfig.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/server/transaction.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/server/transaction.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/smf.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/smf.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/solver.so 755 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/sysvpkg.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/sysvpkg.pyc 444 root bin
-d none usr/lib/python2.4/vendor-packages/pkg/um 755 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/updatelog.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/updatelog.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/urlhelpers.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/urlhelpers.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/variant.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/variant.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/version.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/pkg/version.pyc 444 root bin
+d none usr/lib/python2.6 755 root bin
+d none usr/lib/python2.6/vendor-packages 755 root bin
+f none usr/lib/python2.6/vendor-packages/pkg-0.1-py2.6.egg-info 444 root bin
+d none usr/lib/python2.6/vendor-packages/pkg 755 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/__init__.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/__init__.pyc 444 root bin
+d none usr/lib/python2.6/vendor-packages/pkg/actions 755 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/actions/__init__.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/actions/__init__.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/actions/_actions.so 755 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/actions/attribute.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/actions/attribute.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/actions/depend.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/actions/depend.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/actions/directory.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/actions/directory.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/actions/driver.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/actions/driver.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/actions/file.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/actions/file.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/actions/generic.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/actions/generic.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/actions/group.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/actions/group.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/actions/hardlink.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/actions/hardlink.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/actions/legacy.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/actions/legacy.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/actions/license.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/actions/license.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/actions/link.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/actions/link.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/actions/signature.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/actions/signature.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/actions/unknown.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/actions/unknown.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/actions/user.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/actions/user.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/arch.so 755 root bin
+d none usr/lib/python2.6/vendor-packages/pkg/bundle 755 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/bundle/DirectoryBundle.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/bundle/DirectoryBundle.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/bundle/SolarisPackageDatastreamBundle.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/bundle/SolarisPackageDatastreamBundle.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/bundle/SolarisPackageDirBundle.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/bundle/SolarisPackageDirBundle.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/bundle/TarBundle.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/bundle/TarBundle.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/bundle/__init__.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/bundle/__init__.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/catalog.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/catalog.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/cfgfiles.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/cfgfiles.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/choose.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/choose.pyc 444 root bin
+d none usr/lib/python2.6/vendor-packages/pkg/client 755 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/client/__init__.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/client/__init__.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/client/actuator.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/client/actuator.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/client/api.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/client/api.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/client/api_errors.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/client/api_errors.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/client/bootenv.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/client/bootenv.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/client/debugvalues.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/client/debugvalues.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/client/history.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/client/history.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/client/image.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/client/image.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/client/imageconfig.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/client/imageconfig.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/client/imageplan.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/client/imageplan.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/client/imagetypes.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/client/imagetypes.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/client/indexer.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/client/indexer.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/client/pkg_solver.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/client/pkg_solver.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/client/pkgplan.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/client/pkgplan.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/client/progress.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/client/progress.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/client/publisher.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/client/publisher.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/client/query_parser.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/client/query_parser.pyc 444 root bin
+d none usr/lib/python2.6/vendor-packages/pkg/client/transport 755 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/client/transport/__init__.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/client/transport/__init__.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/client/transport/engine.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/client/transport/engine.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/client/transport/exception.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/client/transport/exception.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/client/transport/fileobj.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/client/transport/fileobj.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/client/transport/repo.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/client/transport/repo.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/client/transport/stats.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/client/transport/stats.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/client/transport/transport.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/client/transport/transport.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/cpiofile.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/cpiofile.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/dependency.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/dependency.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/depotcontroller.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/depotcontroller.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/elf.so 755 root bin
+d none usr/lib/python2.6/vendor-packages/pkg/file_layout 755 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/file_layout/__init__.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/file_layout/__init__.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/file_layout/layout.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/file_layout/layout.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/file_layout/file_manager.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/file_layout/file_manager.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/facet.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/facet.pyc 444 root bin
+d none usr/lib/python2.6/vendor-packages/pkg/flavor 755 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/flavor/__init__.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/flavor/__init__.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/flavor/base.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/flavor/base.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/flavor/depthlimitedmf.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/flavor/depthlimitedmf.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/flavor/elf.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/flavor/elf.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/flavor/hardlink.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/flavor/hardlink.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/flavor/python.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/flavor/python.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/flavor/script.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/flavor/script.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/fmri.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/fmri.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/indexer.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/indexer.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/manifest.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/manifest.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/misc.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/misc.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/nrlock.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/nrlock.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/p5i.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/p5i.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/pkggzip.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/pkggzip.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/pkgsubprocess.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/pkgsubprocess.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/pkgtarfile.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/pkgtarfile.pyc 444 root bin
+d none usr/lib/python2.6/vendor-packages/pkg/portable 755 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/portable/__init__.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/portable/__init__.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/portable/os_aix.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/portable/os_aix.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/portable/os_darwin.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/portable/os_darwin.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/portable/os_sunos.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/portable/os_sunos.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/portable/os_unix.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/portable/os_unix.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/portable/os_windows.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/portable/os_windows.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/portable/util.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/portable/util.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/pspawn.so 755 root bin
+d none usr/lib/python2.6/vendor-packages/pkg/publish 755 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/publish/__init__.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/publish/__init__.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/publish/dependencies.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/publish/dependencies.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/publish/transaction.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/publish/transaction.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/query_parser.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/query_parser.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/search_errors.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/search_errors.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/search_storage.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/search_storage.pyc 444 root bin
+d none usr/lib/python2.6/vendor-packages/pkg/server 755 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/server/__init__.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/server/__init__.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/server/api.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/server/api.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/server/api_errors.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/server/api_errors.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/server/catalog.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/server/catalog.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/server/depot.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/server/depot.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/server/depotresponse.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/server/depotresponse.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/server/face.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/server/face.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/server/feed.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/server/feed.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/server/query_parser.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/server/query_parser.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/server/repository.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/server/repository.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/server/repositoryconfig.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/server/repositoryconfig.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/server/transaction.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/server/transaction.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/smf.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/smf.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/solver.so 755 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/sysvpkg.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/sysvpkg.pyc 444 root bin
+d none usr/lib/python2.6/vendor-packages/pkg/um 755 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/updatelog.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/updatelog.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/urlhelpers.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/urlhelpers.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/variant.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/variant.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/version.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/pkg/version.pyc 444 root bin
 d none usr/share 755 root sys
 d none usr/share/lib 755 root sys
 d none usr/share/lib/pkg 755 root bin

--- a/src/pkgdefs/SUNWldtp/Makefile	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/pkgdefs/SUNWldtp/Makefile	Mon Nov 30 13:01:40 2009 -0800
@@ -27,7 +27,7 @@
 ROOT = ../../../proto/root_$(MACH)
 PKG = SUNWldtp
 PKGARCHIVE = ../../../packages/$(MACH)
-PROTOLOC = $(ROOT)/usr/lib/python2.4/vendor-packages
+PROTOLOC = $(ROOT)/usr/lib/python2.6/vendor-packages
 
 # By default create only the sysv package; failure of the IPS package to build
 # may confuse without enlightening.

--- a/src/pkgdefs/SUNWldtp/prototype	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/pkgdefs/SUNWldtp/prototype	Mon Nov 30 13:01:40 2009 -0800
@@ -31,47 +31,47 @@
 f none usr/bin/ldtpeditor 755 root bin
 f none usr/bin/ldtprunner 755 root bin
 d none usr/lib 755 root bin
-d none usr/lib/python2.4 755 root bin
-d none usr/lib/python2.4/vendor-packages 755 root bin
-f none usr/lib/python2.4/vendor-packages/ldtp.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/ldtp.pyc 444 root bin
-d none usr/lib/python2.4/vendor-packages/ldtplib 755 root bin
-f none usr/lib/python2.4/vendor-packages/ldtplib/__init__.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/ldtplib/__init__.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/ldtplib/acss.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/ldtplib/acss.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/ldtplib/atspi.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/ldtplib/atspi.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/ldtplib/checkbox.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/ldtplib/checkbox.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/ldtplib/clienthandler.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/ldtplib/clienthandler.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/ldtplib/debug.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/ldtplib/debug.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/ldtplib/ldtpcommon.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/ldtplib/ldtpcommon.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/ldtplib/ldtpgui.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/ldtplib/ldtpgui.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/ldtplib/ldtplibutils.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/ldtplib/ldtplibutils.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/ldtplib/ldtprecorder.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/ldtplib/ldtprecorder.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/ldtplib/ldtprequest.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/ldtplib/ldtprequest.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/ldtplib/libldtpcodegen.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/ldtplib/libldtpcodegen.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/ldtplib/orca_i18n.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/ldtplib/orca_i18n.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/ldtplib/pushbutton.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/ldtplib/pushbutton.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/ldtplib/rolenames.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/ldtplib/rolenames.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/ldtplib/settings.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/ldtplib/settings.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/ldtputils.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/ldtputils.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/ooldtp.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/ooldtp.pyc 444 root bin
+d none usr/lib/python2.6 755 root bin
+d none usr/lib/python2.6/vendor-packages 755 root bin
+f none usr/lib/python2.6/vendor-packages/ldtp.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/ldtp.pyc 444 root bin
+d none usr/lib/python2.6/vendor-packages/ldtplib 755 root bin
+f none usr/lib/python2.6/vendor-packages/ldtplib/__init__.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/ldtplib/__init__.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/ldtplib/acss.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/ldtplib/acss.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/ldtplib/atspi.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/ldtplib/atspi.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/ldtplib/checkbox.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/ldtplib/checkbox.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/ldtplib/clienthandler.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/ldtplib/clienthandler.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/ldtplib/debug.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/ldtplib/debug.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/ldtplib/ldtpcommon.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/ldtplib/ldtpcommon.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/ldtplib/ldtpgui.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/ldtplib/ldtpgui.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/ldtplib/ldtplibutils.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/ldtplib/ldtplibutils.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/ldtplib/ldtprecorder.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/ldtplib/ldtprecorder.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/ldtplib/ldtprequest.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/ldtplib/ldtprequest.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/ldtplib/libldtpcodegen.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/ldtplib/libldtpcodegen.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/ldtplib/orca_i18n.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/ldtplib/orca_i18n.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/ldtplib/pushbutton.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/ldtplib/pushbutton.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/ldtplib/rolenames.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/ldtplib/rolenames.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/ldtplib/settings.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/ldtplib/settings.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/ldtputils.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/ldtputils.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/ooldtp.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/ooldtp.pyc 444 root bin
 d none usr/share 755 root sys
 d none usr/share/ldtp 755 root bin
 f none usr/share/ldtp/appdata 444 root bin

--- a/src/pkgdefs/SUNWpython-cherrypy/Makefile	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/pkgdefs/SUNWpython-cherrypy/Makefile	Mon Nov 30 13:01:40 2009 -0800
@@ -27,7 +27,7 @@
 ROOT = ../../../proto/root_$(MACH)
 PKG = SUNWpython-cherrypy
 PKGARCHIVE = ../../../packages/$(MACH)
-PROTOLOC = $(ROOT)/usr/lib/python2.4/vendor-packages/cherrypy
+PROTOLOC = $(ROOT)/usr/lib/python2.6/vendor-packages/cherrypy
 
 # By default create only the sysv package; failure of the IPS package to build
 # may confuse without enlightening.

--- a/src/pkgdefs/SUNWpython-cherrypy/copyright	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/pkgdefs/SUNWpython-cherrypy/copyright	Mon Nov 30 13:01:40 2009 -0800
@@ -1,25 +1,25 @@
-Copyright (c) 2004-2007, CherryPy Team ([email protected])
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, 
-are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright notice, 
-      this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright notice, 
-      this list of conditions and the following disclaimer in the documentation 
-      and/or other materials provided with the distribution.
-    * Neither the name of the CherryPy Team nor the names of its contributors 
-      may be used to endorse or promote products derived from this software 
-      without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE 
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR 
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER 
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, 
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+Copyright (c) 2004-2007, CherryPy Team ([email protected])
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, 
+are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice, 
+      this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright notice, 
+      this list of conditions and the following disclaimer in the documentation 
+      and/or other materials provided with the distribution.
+    * Neither the name of the CherryPy Team nor the names of its contributors 
+      may be used to endorse or promote products derived from this software 
+      without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE 
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR 
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER 
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, 
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

--- a/src/pkgdefs/SUNWpython-cherrypy/pkginfo	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/pkgdefs/SUNWpython-cherrypy/pkginfo	Mon Nov 30 13:01:40 2009 -0800
@@ -26,7 +26,7 @@
 NAME="Pythonic, object-oriented HTTP framework"
 DESC="CherryPy is a pythonic, object-oriented HTTP framework"
 ARCH="ISA"
-VERSION="3.1.1"
+VERSION="3.1.2"
 SUNW_PKGVERS="1.0"
 BASEDIR=/
 CATEGORY="system"

--- a/src/pkgdefs/SUNWpython-cherrypy/prototype	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/pkgdefs/SUNWpython-cherrypy/prototype	Mon Nov 30 13:01:40 2009 -0800
@@ -1,85 +1,88 @@
 i pkginfo
 i copyright
 d none usr 755 root sys
+d none usr/bin 755 root bin
+f none usr/bin/cherryd 755 root bin
 d none usr/lib 755 root bin
-d none usr/lib/python2.4 755 root bin
-d none usr/lib/python2.4/vendor-packages 755 root bin
-d none usr/lib/python2.4/vendor-packages/cherrypy 755 root bin
-f none usr/lib/python2.4/vendor-packages/cherrypy/LICENSE.txt 444 root bin
-f none usr/lib/python2.4/vendor-packages/cherrypy/__init__.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/cherrypy/__init__.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/cherrypy/_cpcgifs.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/cherrypy/_cpcgifs.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/cherrypy/_cpchecker.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/cherrypy/_cpchecker.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/cherrypy/_cpconfig.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/cherrypy/_cpconfig.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/cherrypy/_cpdispatch.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/cherrypy/_cpdispatch.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/cherrypy/_cperror.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/cherrypy/_cperror.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/cherrypy/_cplogging.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/cherrypy/_cplogging.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/cherrypy/_cpmodpy.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/cherrypy/_cpmodpy.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/cherrypy/_cprequest.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/cherrypy/_cprequest.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/cherrypy/_cpserver.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/cherrypy/_cpserver.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/cherrypy/_cpthreadinglocal.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/cherrypy/_cpthreadinglocal.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/cherrypy/_cptools.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/cherrypy/_cptools.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/cherrypy/_cptree.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/cherrypy/_cptree.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/cherrypy/_cpwsgi.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/cherrypy/_cpwsgi.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/cherrypy/_cpwsgi_server.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/cherrypy/_cpwsgi_server.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/cherrypy/cherryd 444 root bin
-f none usr/lib/python2.4/vendor-packages/cherrypy/favicon.ico 444 root bin
-d none usr/lib/python2.4/vendor-packages/cherrypy/lib 755 root bin
-f none usr/lib/python2.4/vendor-packages/cherrypy/lib/__init__.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/cherrypy/lib/__init__.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/cherrypy/lib/auth.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/cherrypy/lib/auth.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/cherrypy/lib/caching.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/cherrypy/lib/caching.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/cherrypy/lib/covercp.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/cherrypy/lib/covercp.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/cherrypy/lib/cptools.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/cherrypy/lib/cptools.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/cherrypy/lib/encoding.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/cherrypy/lib/encoding.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/cherrypy/lib/http.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/cherrypy/lib/http.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/cherrypy/lib/httpauth.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/cherrypy/lib/httpauth.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/cherrypy/lib/profiler.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/cherrypy/lib/profiler.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/cherrypy/lib/safemime.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/cherrypy/lib/safemime.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/cherrypy/lib/sessions.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/cherrypy/lib/sessions.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/cherrypy/lib/static.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/cherrypy/lib/static.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/cherrypy/lib/tidy.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/cherrypy/lib/tidy.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/cherrypy/lib/wsgiapp.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/cherrypy/lib/wsgiapp.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/cherrypy/lib/xmlrpc.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/cherrypy/lib/xmlrpc.pyc 444 root bin
-d none usr/lib/python2.4/vendor-packages/cherrypy/process 755 root bin
-f none usr/lib/python2.4/vendor-packages/cherrypy/process/__init__.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/cherrypy/process/__init__.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/cherrypy/process/plugins.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/cherrypy/process/plugins.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/cherrypy/process/servers.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/cherrypy/process/servers.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/cherrypy/process/win32.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/cherrypy/process/win32.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/cherrypy/process/wspbus.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/cherrypy/process/wspbus.pyc 444 root bin
-d none usr/lib/python2.4/vendor-packages/cherrypy/wsgiserver 755 root bin
-f none usr/lib/python2.4/vendor-packages/cherrypy/wsgiserver/__init__.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/cherrypy/wsgiserver/__init__.pyc 444 root bin
+d none usr/lib/python2.6 755 root bin
+d none usr/lib/python2.6/vendor-packages 755 root bin
+f none usr/lib/python2.6/vendor-packages/CherryPy-3.1.2-py2.6.egg-info 444 root bin
+d none usr/lib/python2.6/vendor-packages/cherrypy 755 root bin
+f none usr/lib/python2.6/vendor-packages/cherrypy/LICENSE.txt 444 root bin
+f none usr/lib/python2.6/vendor-packages/cherrypy/__init__.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/cherrypy/__init__.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/cherrypy/_cpcgifs.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/cherrypy/_cpcgifs.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/cherrypy/_cpchecker.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/cherrypy/_cpchecker.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/cherrypy/_cpconfig.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/cherrypy/_cpconfig.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/cherrypy/_cpdispatch.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/cherrypy/_cpdispatch.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/cherrypy/_cperror.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/cherrypy/_cperror.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/cherrypy/_cplogging.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/cherrypy/_cplogging.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/cherrypy/_cpmodpy.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/cherrypy/_cpmodpy.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/cherrypy/_cprequest.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/cherrypy/_cprequest.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/cherrypy/_cpserver.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/cherrypy/_cpserver.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/cherrypy/_cpthreadinglocal.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/cherrypy/_cpthreadinglocal.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/cherrypy/_cptools.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/cherrypy/_cptools.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/cherrypy/_cptree.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/cherrypy/_cptree.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/cherrypy/_cpwsgi.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/cherrypy/_cpwsgi.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/cherrypy/_cpwsgi_server.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/cherrypy/_cpwsgi_server.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/cherrypy/cherryd 444 root bin
+f none usr/lib/python2.6/vendor-packages/cherrypy/favicon.ico 444 root bin
+d none usr/lib/python2.6/vendor-packages/cherrypy/lib 755 root bin
+f none usr/lib/python2.6/vendor-packages/cherrypy/lib/__init__.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/cherrypy/lib/__init__.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/cherrypy/lib/auth.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/cherrypy/lib/auth.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/cherrypy/lib/caching.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/cherrypy/lib/caching.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/cherrypy/lib/covercp.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/cherrypy/lib/covercp.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/cherrypy/lib/cptools.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/cherrypy/lib/cptools.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/cherrypy/lib/encoding.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/cherrypy/lib/encoding.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/cherrypy/lib/http.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/cherrypy/lib/http.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/cherrypy/lib/httpauth.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/cherrypy/lib/httpauth.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/cherrypy/lib/profiler.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/cherrypy/lib/profiler.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/cherrypy/lib/safemime.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/cherrypy/lib/safemime.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/cherrypy/lib/sessions.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/cherrypy/lib/sessions.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/cherrypy/lib/static.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/cherrypy/lib/static.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/cherrypy/lib/tidy.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/cherrypy/lib/tidy.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/cherrypy/lib/wsgiapp.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/cherrypy/lib/wsgiapp.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/cherrypy/lib/xmlrpc.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/cherrypy/lib/xmlrpc.pyc 444 root bin
+d none usr/lib/python2.6/vendor-packages/cherrypy/process 755 root bin
+f none usr/lib/python2.6/vendor-packages/cherrypy/process/__init__.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/cherrypy/process/__init__.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/cherrypy/process/plugins.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/cherrypy/process/plugins.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/cherrypy/process/servers.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/cherrypy/process/servers.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/cherrypy/process/win32.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/cherrypy/process/win32.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/cherrypy/process/wspbus.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/cherrypy/process/wspbus.pyc 444 root bin
+d none usr/lib/python2.6/vendor-packages/cherrypy/wsgiserver 755 root bin
+f none usr/lib/python2.6/vendor-packages/cherrypy/wsgiserver/__init__.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/cherrypy/wsgiserver/__init__.pyc 444 root bin

--- a/src/pkgdefs/SUNWpython-coverage/Makefile	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/pkgdefs/SUNWpython-coverage/Makefile	Mon Nov 30 13:01:40 2009 -0800
@@ -27,7 +27,7 @@
 ROOT = ../../../proto/root_$(MACH)
 PKG = SUNWpython-coverage
 PKGARCHIVE = ../../../packages/$(MACH)
-PROTOLOC = $(ROOT)/usr/lib/python2.4/vendor-packages/coverage
+PROTOLOC = $(ROOT)/usr/lib/python2.6/vendor-packages/coverage
 
 # By default create only the sysv package; failure of the IPS package to build
 # may confuse without enlightening.

--- a/src/pkgdefs/SUNWpython-coverage/prototype	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/pkgdefs/SUNWpython-coverage/prototype	Mon Nov 30 13:01:40 2009 -0800
@@ -4,59 +4,59 @@
 d none usr/bin 755 root bin
 f none usr/bin/coverage 755 root bin
 d none usr/lib 755 root bin
-d none usr/lib/python2.4 755 root bin
-d none usr/lib/python2.4/vendor-packages 755 root bin
-d none usr/lib/python2.4/vendor-packages/coverage-3.2b2-py2.4.egg-info 755 root bin
-f none usr/lib/python2.4/vendor-packages/coverage-3.2b2-py2.4.egg-info/PKG-INFO 444 root bin
-f none usr/lib/python2.4/vendor-packages/coverage-3.2b2-py2.4.egg-info/SOURCES.txt 444 root bin
-f none usr/lib/python2.4/vendor-packages/coverage-3.2b2-py2.4.egg-info/dependency_links.txt 444 root bin
-f none usr/lib/python2.4/vendor-packages/coverage-3.2b2-py2.4.egg-info/entry_points.txt 444 root bin
-f none usr/lib/python2.4/vendor-packages/coverage-3.2b2-py2.4.egg-info/not-zip-safe 444 root bin
-f none usr/lib/python2.4/vendor-packages/coverage-3.2b2-py2.4.egg-info/top_level.txt 444 root bin
-d none usr/lib/python2.4/vendor-packages/coverage 755 root bin
-f none usr/lib/python2.4/vendor-packages/coverage/__init__.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/coverage/__init__.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/coverage/annotate.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/coverage/annotate.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/coverage/backward.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/coverage/backward.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/coverage/bytecode.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/coverage/bytecode.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/coverage/cmdline.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/coverage/cmdline.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/coverage/codeunit.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/coverage/codeunit.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/coverage/collector.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/coverage/collector.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/coverage/control.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/coverage/control.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/coverage/data.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/coverage/data.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/coverage/execfile.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/coverage/execfile.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/coverage/files.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/coverage/files.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/coverage/html.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/coverage/html.pyc 444 root bin
-d none usr/lib/python2.4/vendor-packages/coverage/htmlfiles 755 root bin
-f none usr/lib/python2.4/vendor-packages/coverage/htmlfiles/index.html 444 root bin
-f none usr/lib/python2.4/vendor-packages/coverage/htmlfiles/jquery-1.3.2.min.js 444 root bin
-f none usr/lib/python2.4/vendor-packages/coverage/htmlfiles/pyfile.html 444 root bin
-f none usr/lib/python2.4/vendor-packages/coverage/htmlfiles/style.css 444 root bin
-f none usr/lib/python2.4/vendor-packages/coverage/misc.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/coverage/misc.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/coverage/parser.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/coverage/parser.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/coverage/phystokens.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/coverage/phystokens.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/coverage/report.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/coverage/report.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/coverage/results.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/coverage/results.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/coverage/summary.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/coverage/summary.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/coverage/templite.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/coverage/templite.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/coverage/tracer.so 444 root bin
-f none usr/lib/python2.4/vendor-packages/coverage/xmlreport.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/coverage/xmlreport.pyc 444 root bin
+d none usr/lib/python2.6 755 root bin
+d none usr/lib/python2.6/vendor-packages 755 root bin
+d none usr/lib/python2.6/vendor-packages/coverage-3.2b2-py2.6.egg-info 755 root bin
+f none usr/lib/python2.6/vendor-packages/coverage-3.2b2-py2.6.egg-info/PKG-INFO 444 root bin
+f none usr/lib/python2.6/vendor-packages/coverage-3.2b2-py2.6.egg-info/SOURCES.txt 444 root bin
+f none usr/lib/python2.6/vendor-packages/coverage-3.2b2-py2.6.egg-info/dependency_links.txt 444 root bin
+f none usr/lib/python2.6/vendor-packages/coverage-3.2b2-py2.6.egg-info/entry_points.txt 444 root bin
+f none usr/lib/python2.6/vendor-packages/coverage-3.2b2-py2.6.egg-info/not-zip-safe 444 root bin
+f none usr/lib/python2.6/vendor-packages/coverage-3.2b2-py2.6.egg-info/top_level.txt 444 root bin
+d none usr/lib/python2.6/vendor-packages/coverage 755 root bin
+f none usr/lib/python2.6/vendor-packages/coverage/__init__.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/coverage/__init__.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/coverage/annotate.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/coverage/annotate.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/coverage/backward.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/coverage/backward.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/coverage/bytecode.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/coverage/bytecode.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/coverage/cmdline.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/coverage/cmdline.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/coverage/codeunit.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/coverage/codeunit.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/coverage/collector.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/coverage/collector.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/coverage/control.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/coverage/control.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/coverage/data.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/coverage/data.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/coverage/execfile.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/coverage/execfile.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/coverage/files.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/coverage/files.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/coverage/html.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/coverage/html.pyc 444 root bin
+d none usr/lib/python2.6/vendor-packages/coverage/htmlfiles 755 root bin
+f none usr/lib/python2.6/vendor-packages/coverage/htmlfiles/index.html 444 root bin
+f none usr/lib/python2.6/vendor-packages/coverage/htmlfiles/jquery-1.3.2.min.js 444 root bin
+f none usr/lib/python2.6/vendor-packages/coverage/htmlfiles/pyfile.html 444 root bin
+f none usr/lib/python2.6/vendor-packages/coverage/htmlfiles/style.css 444 root bin
+f none usr/lib/python2.6/vendor-packages/coverage/misc.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/coverage/misc.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/coverage/parser.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/coverage/parser.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/coverage/phystokens.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/coverage/phystokens.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/coverage/report.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/coverage/report.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/coverage/results.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/coverage/results.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/coverage/summary.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/coverage/summary.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/coverage/templite.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/coverage/templite.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/coverage/tracer.so 444 root bin
+f none usr/lib/python2.6/vendor-packages/coverage/xmlreport.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/coverage/xmlreport.pyc 444 root bin

--- a/src/pkgdefs/SUNWpython-mako/Makefile	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/pkgdefs/SUNWpython-mako/Makefile	Mon Nov 30 13:01:40 2009 -0800
@@ -27,7 +27,7 @@
 ROOT = ../../../proto/root_$(MACH)
 PKG = SUNWpython-mako
 PKGARCHIVE = ../../../packages/$(MACH)
-PROTOLOC = $(ROOT)/usr/lib/python2.4/vendor-packages/mako
+PROTOLOC = $(ROOT)/usr/lib/python2.6/vendor-packages/mako
 
 # By default create only the sysv package; failure of the IPS package to build
 # may confuse without enlightening.

--- a/src/pkgdefs/SUNWpython-mako/prototype	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/pkgdefs/SUNWpython-mako/prototype	Mon Nov 30 13:01:40 2009 -0800
@@ -2,57 +2,57 @@
 i copyright
 d none usr 755 root sys
 d none usr/lib 755 root bin
-d none usr/lib/python2.4 755 root bin
-d none usr/lib/python2.4/vendor-packages 755 root bin
-d none usr/lib/python2.4/vendor-packages/Mako-0.2.2-py2.4.egg-info 755 root bin
-f none usr/lib/python2.4/vendor-packages/Mako-0.2.2-py2.4.egg-info/PKG-INFO 444 root bin
-f none usr/lib/python2.4/vendor-packages/Mako-0.2.2-py2.4.egg-info/SOURCES.txt 444 root bin
-f none usr/lib/python2.4/vendor-packages/Mako-0.2.2-py2.4.egg-info/dependency_links.txt 444 root bin
-f none usr/lib/python2.4/vendor-packages/Mako-0.2.2-py2.4.egg-info/entry_points.txt 444 root bin
-f none usr/lib/python2.4/vendor-packages/Mako-0.2.2-py2.4.egg-info/not-zip-safe 444 root bin
-f none usr/lib/python2.4/vendor-packages/Mako-0.2.2-py2.4.egg-info/requires.txt 444 root bin
-f none usr/lib/python2.4/vendor-packages/Mako-0.2.2-py2.4.egg-info/top_level.txt 444 root bin
-d none usr/lib/python2.4/vendor-packages/mako 755 root bin
-f none usr/lib/python2.4/vendor-packages/mako/__init__.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/mako/__init__.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/mako/_ast_util.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/mako/_ast_util.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/mako/ast.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/mako/ast.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/mako/cache.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/mako/cache.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/mako/codegen.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/mako/codegen.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/mako/exceptions.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/mako/exceptions.pyc 444 root bin
-d none usr/lib/python2.4/vendor-packages/mako/ext 755 root bin
-f none usr/lib/python2.4/vendor-packages/mako/ext/__init__.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/mako/ext/__init__.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/mako/ext/autohandler.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/mako/ext/autohandler.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/mako/ext/babelplugin.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/mako/ext/babelplugin.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/mako/ext/preprocessors.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/mako/ext/preprocessors.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/mako/ext/pygmentplugin.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/mako/ext/pygmentplugin.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/mako/ext/turbogears.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/mako/ext/turbogears.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/mako/filters.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/mako/filters.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/mako/lexer.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/mako/lexer.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/mako/lookup.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/mako/lookup.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/mako/parsetree.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/mako/parsetree.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/mako/pygen.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/mako/pygen.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/mako/pyparser.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/mako/pyparser.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/mako/runtime.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/mako/runtime.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/mako/template.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/mako/template.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/mako/util.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/mako/util.pyc 444 root bin
+d none usr/lib/python2.6 755 root bin
+d none usr/lib/python2.6/vendor-packages 755 root bin
+d none usr/lib/python2.6/vendor-packages/Mako-0.2.2-py2.6.egg-info 755 root bin
+f none usr/lib/python2.6/vendor-packages/Mako-0.2.2-py2.6.egg-info/PKG-INFO 444 root bin
+f none usr/lib/python2.6/vendor-packages/Mako-0.2.2-py2.6.egg-info/SOURCES.txt 444 root bin
+f none usr/lib/python2.6/vendor-packages/Mako-0.2.2-py2.6.egg-info/dependency_links.txt 444 root bin
+f none usr/lib/python2.6/vendor-packages/Mako-0.2.2-py2.6.egg-info/entry_points.txt 444 root bin
+f none usr/lib/python2.6/vendor-packages/Mako-0.2.2-py2.6.egg-info/not-zip-safe 444 root bin
+f none usr/lib/python2.6/vendor-packages/Mako-0.2.2-py2.6.egg-info/requires.txt 444 root bin
+f none usr/lib/python2.6/vendor-packages/Mako-0.2.2-py2.6.egg-info/top_level.txt 444 root bin
+d none usr/lib/python2.6/vendor-packages/mako 755 root bin
+f none usr/lib/python2.6/vendor-packages/mako/__init__.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/mako/__init__.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/mako/_ast_util.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/mako/_ast_util.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/mako/ast.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/mako/ast.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/mako/cache.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/mako/cache.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/mako/codegen.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/mako/codegen.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/mako/exceptions.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/mako/exceptions.pyc 444 root bin
+d none usr/lib/python2.6/vendor-packages/mako/ext 755 root bin
+f none usr/lib/python2.6/vendor-packages/mako/ext/__init__.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/mako/ext/__init__.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/mako/ext/autohandler.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/mako/ext/autohandler.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/mako/ext/babelplugin.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/mako/ext/babelplugin.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/mako/ext/preprocessors.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/mako/ext/preprocessors.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/mako/ext/pygmentplugin.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/mako/ext/pygmentplugin.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/mako/ext/turbogears.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/mako/ext/turbogears.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/mako/filters.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/mako/filters.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/mako/lexer.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/mako/lexer.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/mako/lookup.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/mako/lookup.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/mako/parsetree.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/mako/parsetree.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/mako/pygen.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/mako/pygen.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/mako/pyparser.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/mako/pyparser.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/mako/runtime.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/mako/runtime.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/mako/template.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/mako/template.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/mako/util.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/mako/util.pyc 444 root bin

--- a/src/pkgdefs/SUNWpython-ply/Makefile	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/pkgdefs/SUNWpython-ply/Makefile	Mon Nov 30 13:01:40 2009 -0800
@@ -27,7 +27,7 @@
 ROOT = ../../../proto/root_$(MACH)
 PKG = SUNWpython-ply
 PKGARCHIVE = ../../../packages/$(MACH)
-PROTOLOC = $(ROOT)/usr/lib/python2.4/vendor-packages/ply
+PROTOLOC = $(ROOT)/usr/lib/python2.6/vendor-packages/ply
 
 # By default create only the sysv package; failure of the IPS package to build
 # may confuse without enlightening.

--- a/src/pkgdefs/SUNWpython-ply/prototype	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/pkgdefs/SUNWpython-ply/prototype	Mon Nov 30 13:01:40 2009 -0800
@@ -2,21 +2,21 @@
 i copyright
 d none usr 755 root sys
 d none usr/lib 755 root bin
-d none usr/lib/python2.4 755 root bin
-d none usr/lib/python2.4/vendor-packages 755 root bin
-d none usr/lib/python2.4/vendor-packages/ply 755 root bin
-d none usr/lib/python2.4/vendor-packages/ply-3.1-py2.4.egg-info 755 root bin
-f none usr/lib/python2.4/vendor-packages/ply-3.1-py2.4.egg-info/dependency_links.txt 444 root bin
-f none usr/lib/python2.4/vendor-packages/ply-3.1-py2.4.egg-info/PKG-INFO 444 root bin
-f none usr/lib/python2.4/vendor-packages/ply-3.1-py2.4.egg-info/SOURCES.txt 444 root bin
-f none usr/lib/python2.4/vendor-packages/ply-3.1-py2.4.egg-info/top_level.txt 444 root bin
-f none usr/lib/python2.4/vendor-packages/ply/cpp.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/ply/cpp.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/ply/ctokens.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/ply/ctokens.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/ply/__init__.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/ply/__init__.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/ply/lex.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/ply/lex.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/ply/yacc.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/ply/yacc.pyc 444 root bin
+d none usr/lib/python2.6 755 root bin
+d none usr/lib/python2.6/vendor-packages 755 root bin
+d none usr/lib/python2.6/vendor-packages/ply 755 root bin
+d none usr/lib/python2.6/vendor-packages/ply-3.1-py2.6.egg-info 755 root bin
+f none usr/lib/python2.6/vendor-packages/ply-3.1-py2.6.egg-info/dependency_links.txt 444 root bin
+f none usr/lib/python2.6/vendor-packages/ply-3.1-py2.6.egg-info/PKG-INFO 444 root bin
+f none usr/lib/python2.6/vendor-packages/ply-3.1-py2.6.egg-info/SOURCES.txt 444 root bin
+f none usr/lib/python2.6/vendor-packages/ply-3.1-py2.6.egg-info/top_level.txt 444 root bin
+f none usr/lib/python2.6/vendor-packages/ply/cpp.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/ply/cpp.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/ply/ctokens.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/ply/ctokens.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/ply/__init__.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/ply/__init__.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/ply/lex.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/ply/lex.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/ply/yacc.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/ply/yacc.pyc 444 root bin

--- a/src/pkgdefs/SUNWpython-pycurl/prototype	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/pkgdefs/SUNWpython-pycurl/prototype	Mon Nov 30 13:01:40 2009 -0800
@@ -2,59 +2,60 @@
 i pkginfo
 d none usr 755 root sys
 d none usr/lib 755 root bin
-d none usr/lib/python2.4 755 root bin
-d none usr/lib/python2.4/vendor-packages 755 root bin
-d none usr/lib/python2.4/vendor-packages/curl 755 root bin
-f none usr/lib/python2.4/vendor-packages/curl/__init__.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/curl/__init__.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/pycurl.so 444 root bin
-d none usr/lib/python2.4/vendor-packages/share 755 root bin
-d none usr/lib/python2.4/vendor-packages/share/doc 755 root bin
-d none usr/lib/python2.4/vendor-packages/share/doc/pycurl 755 root bin
-f none usr/lib/python2.4/vendor-packages/share/doc/pycurl/COPYING 444 root bin
-f none usr/lib/python2.4/vendor-packages/share/doc/pycurl/COPYING2 444 root bin
-f none usr/lib/python2.4/vendor-packages/share/doc/pycurl/ChangeLog 444 root bin
-f none usr/lib/python2.4/vendor-packages/share/doc/pycurl/INSTALL 444 root bin
-f none usr/lib/python2.4/vendor-packages/share/doc/pycurl/README 444 root bin
-f none usr/lib/python2.4/vendor-packages/share/doc/pycurl/TODO 444 root bin
-d none usr/lib/python2.4/vendor-packages/share/doc/pycurl/examples 755 root bin
-f none usr/lib/python2.4/vendor-packages/share/doc/pycurl/examples/basicfirst.py 755 root bin
-f none usr/lib/python2.4/vendor-packages/share/doc/pycurl/examples/file_upload.py 755 root bin
-f none usr/lib/python2.4/vendor-packages/share/doc/pycurl/examples/linksys.py 755 root bin
-f none usr/lib/python2.4/vendor-packages/share/doc/pycurl/examples/retriever-multi.py 755 root bin
-f none usr/lib/python2.4/vendor-packages/share/doc/pycurl/examples/retriever.py 755 root bin
-f none usr/lib/python2.4/vendor-packages/share/doc/pycurl/examples/sfquery.py 755 root bin
-f none usr/lib/python2.4/vendor-packages/share/doc/pycurl/examples/xmlrpc_curl.py 755 root bin
-d none usr/lib/python2.4/vendor-packages/share/doc/pycurl/html 755 root bin
-f none usr/lib/python2.4/vendor-packages/share/doc/pycurl/html/callbacks.html 444 root bin
-f none usr/lib/python2.4/vendor-packages/share/doc/pycurl/html/curlmultiobject.html 444 root bin
-f none usr/lib/python2.4/vendor-packages/share/doc/pycurl/html/curlobject.html 444 root bin
-f none usr/lib/python2.4/vendor-packages/share/doc/pycurl/html/curlshareobject.html 444 root bin
-f none usr/lib/python2.4/vendor-packages/share/doc/pycurl/html/pycurl.html 444 root bin
-d none usr/lib/python2.4/vendor-packages/share/doc/pycurl/tests 755 root bin
-f none usr/lib/python2.4/vendor-packages/share/doc/pycurl/tests/test.py 755 root bin
-f none usr/lib/python2.4/vendor-packages/share/doc/pycurl/tests/test_cb.py 755 root bin
-f none usr/lib/python2.4/vendor-packages/share/doc/pycurl/tests/test_debug.py 755 root bin
-f none usr/lib/python2.4/vendor-packages/share/doc/pycurl/tests/test_ftp.py 755 root bin
-f none usr/lib/python2.4/vendor-packages/share/doc/pycurl/tests/test_getinfo.py 755 root bin
-f none usr/lib/python2.4/vendor-packages/share/doc/pycurl/tests/test_gtk.py 755 root bin
-f none usr/lib/python2.4/vendor-packages/share/doc/pycurl/tests/test_internals.py 755 root bin
-f none usr/lib/python2.4/vendor-packages/share/doc/pycurl/tests/test_memleak.py 755 root bin
-f none usr/lib/python2.4/vendor-packages/share/doc/pycurl/tests/test_multi.py 755 root bin
-f none usr/lib/python2.4/vendor-packages/share/doc/pycurl/tests/test_multi2.py 755 root bin
-f none usr/lib/python2.4/vendor-packages/share/doc/pycurl/tests/test_multi3.py 755 root bin
-f none usr/lib/python2.4/vendor-packages/share/doc/pycurl/tests/test_multi4.py 755 root bin
-f none usr/lib/python2.4/vendor-packages/share/doc/pycurl/tests/test_multi5.py 755 root bin
-f none usr/lib/python2.4/vendor-packages/share/doc/pycurl/tests/test_multi6.py 755 root bin
-f none usr/lib/python2.4/vendor-packages/share/doc/pycurl/tests/test_multi_socket.py 755 root bin
-f none usr/lib/python2.4/vendor-packages/share/doc/pycurl/tests/test_multi_socket_select.py 755 root bin
-f none usr/lib/python2.4/vendor-packages/share/doc/pycurl/tests/test_multi_timer.py 755 root bin
-f none usr/lib/python2.4/vendor-packages/share/doc/pycurl/tests/test_multi_vs_thread.py 755 root bin
-f none usr/lib/python2.4/vendor-packages/share/doc/pycurl/tests/test_post.py 755 root bin
-f none usr/lib/python2.4/vendor-packages/share/doc/pycurl/tests/test_post2.py 755 root bin
-f none usr/lib/python2.4/vendor-packages/share/doc/pycurl/tests/test_post3.py 755 root bin
-f none usr/lib/python2.4/vendor-packages/share/doc/pycurl/tests/test_share.py 755 root bin
-f none usr/lib/python2.4/vendor-packages/share/doc/pycurl/tests/test_socketopen.py 755 root bin
-f none usr/lib/python2.4/vendor-packages/share/doc/pycurl/tests/test_stringio.py 755 root bin
-f none usr/lib/python2.4/vendor-packages/share/doc/pycurl/tests/test_xmlrpc.py 755 root bin
-f none usr/lib/python2.4/vendor-packages/share/doc/pycurl/tests/util.py 755 root bin
+d none usr/lib/python2.6 755 root bin
+d none usr/lib/python2.6/vendor-packages 755 root bin
+f none usr/lib/python2.6/vendor-packages/pycurl-7.19.0-py2.6.egg-info 444 root bin
+d none usr/lib/python2.6/vendor-packages/curl 755 root bin
+f none usr/lib/python2.6/vendor-packages/curl/__init__.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/curl/__init__.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/pycurl.so 444 root bin
+d none usr/lib/python2.6/vendor-packages/share 755 root bin
+d none usr/lib/python2.6/vendor-packages/share/doc 755 root bin
+d none usr/lib/python2.6/vendor-packages/share/doc/pycurl 755 root bin
+f none usr/lib/python2.6/vendor-packages/share/doc/pycurl/COPYING 444 root bin
+f none usr/lib/python2.6/vendor-packages/share/doc/pycurl/COPYING2 444 root bin
+f none usr/lib/python2.6/vendor-packages/share/doc/pycurl/ChangeLog 444 root bin
+f none usr/lib/python2.6/vendor-packages/share/doc/pycurl/INSTALL 444 root bin
+f none usr/lib/python2.6/vendor-packages/share/doc/pycurl/README 444 root bin
+f none usr/lib/python2.6/vendor-packages/share/doc/pycurl/TODO 444 root bin
+d none usr/lib/python2.6/vendor-packages/share/doc/pycurl/examples 755 root bin
+f none usr/lib/python2.6/vendor-packages/share/doc/pycurl/examples/basicfirst.py 755 root bin
+f none usr/lib/python2.6/vendor-packages/share/doc/pycurl/examples/file_upload.py 755 root bin
+f none usr/lib/python2.6/vendor-packages/share/doc/pycurl/examples/linksys.py 755 root bin
+f none usr/lib/python2.6/vendor-packages/share/doc/pycurl/examples/retriever-multi.py 755 root bin
+f none usr/lib/python2.6/vendor-packages/share/doc/pycurl/examples/retriever.py 755 root bin
+f none usr/lib/python2.6/vendor-packages/share/doc/pycurl/examples/sfquery.py 755 root bin
+f none usr/lib/python2.6/vendor-packages/share/doc/pycurl/examples/xmlrpc_curl.py 755 root bin
+d none usr/lib/python2.6/vendor-packages/share/doc/pycurl/html 755 root bin
+f none usr/lib/python2.6/vendor-packages/share/doc/pycurl/html/callbacks.html 444 root bin
+f none usr/lib/python2.6/vendor-packages/share/doc/pycurl/html/curlmultiobject.html 444 root bin
+f none usr/lib/python2.6/vendor-packages/share/doc/pycurl/html/curlobject.html 444 root bin
+f none usr/lib/python2.6/vendor-packages/share/doc/pycurl/html/curlshareobject.html 444 root bin
+f none usr/lib/python2.6/vendor-packages/share/doc/pycurl/html/pycurl.html 444 root bin
+d none usr/lib/python2.6/vendor-packages/share/doc/pycurl/tests 755 root bin
+f none usr/lib/python2.6/vendor-packages/share/doc/pycurl/tests/test.py 755 root bin
+f none usr/lib/python2.6/vendor-packages/share/doc/pycurl/tests/test_cb.py 755 root bin
+f none usr/lib/python2.6/vendor-packages/share/doc/pycurl/tests/test_debug.py 755 root bin
+f none usr/lib/python2.6/vendor-packages/share/doc/pycurl/tests/test_ftp.py 755 root bin
+f none usr/lib/python2.6/vendor-packages/share/doc/pycurl/tests/test_getinfo.py 755 root bin
+f none usr/lib/python2.6/vendor-packages/share/doc/pycurl/tests/test_gtk.py 755 root bin
+f none usr/lib/python2.6/vendor-packages/share/doc/pycurl/tests/test_internals.py 755 root bin
+f none usr/lib/python2.6/vendor-packages/share/doc/pycurl/tests/test_memleak.py 755 root bin
+f none usr/lib/python2.6/vendor-packages/share/doc/pycurl/tests/test_multi.py 755 root bin
+f none usr/lib/python2.6/vendor-packages/share/doc/pycurl/tests/test_multi2.py 755 root bin
+f none usr/lib/python2.6/vendor-packages/share/doc/pycurl/tests/test_multi3.py 755 root bin
+f none usr/lib/python2.6/vendor-packages/share/doc/pycurl/tests/test_multi4.py 755 root bin
+f none usr/lib/python2.6/vendor-packages/share/doc/pycurl/tests/test_multi5.py 755 root bin
+f none usr/lib/python2.6/vendor-packages/share/doc/pycurl/tests/test_multi6.py 755 root bin
+f none usr/lib/python2.6/vendor-packages/share/doc/pycurl/tests/test_multi_socket.py 755 root bin
+f none usr/lib/python2.6/vendor-packages/share/doc/pycurl/tests/test_multi_socket_select.py 755 root bin
+f none usr/lib/python2.6/vendor-packages/share/doc/pycurl/tests/test_multi_timer.py 755 root bin
+f none usr/lib/python2.6/vendor-packages/share/doc/pycurl/tests/test_multi_vs_thread.py 755 root bin
+f none usr/lib/python2.6/vendor-packages/share/doc/pycurl/tests/test_post.py 755 root bin
+f none usr/lib/python2.6/vendor-packages/share/doc/pycurl/tests/test_post2.py 755 root bin
+f none usr/lib/python2.6/vendor-packages/share/doc/pycurl/tests/test_post3.py 755 root bin
+f none usr/lib/python2.6/vendor-packages/share/doc/pycurl/tests/test_share.py 755 root bin
+f none usr/lib/python2.6/vendor-packages/share/doc/pycurl/tests/test_socketopen.py 755 root bin
+f none usr/lib/python2.6/vendor-packages/share/doc/pycurl/tests/test_stringio.py 755 root bin
+f none usr/lib/python2.6/vendor-packages/share/doc/pycurl/tests/test_xmlrpc.py 755 root bin
+f none usr/lib/python2.6/vendor-packages/share/doc/pycurl/tests/util.py 755 root bin

--- a/src/pkgdefs/SUNWpython-pyopenssl/Makefile	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/pkgdefs/SUNWpython-pyopenssl/Makefile	Mon Nov 30 13:01:40 2009 -0800
@@ -27,7 +27,7 @@
 ROOT = ../../../proto/root_$(MACH)
 PKG = SUNWpython-pyopenssl
 PKGARCHIVE = ../../../packages/$(MACH)
-PROTOLOC = $(ROOT)/usr/lib/python2.4/vendor-packages/OpenSSL
+PROTOLOC = $(ROOT)/usr/lib/python2.6/vendor-packages/OpenSSL
 
 # By default create only the sysv package; failure of the IPS package to build
 # may confuse without enlightening.

--- a/src/pkgdefs/SUNWpython-pyopenssl/prototype	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/pkgdefs/SUNWpython-pyopenssl/prototype	Mon Nov 30 13:01:40 2009 -0800
@@ -2,22 +2,22 @@
 i copyright
 d none usr 755 root sys
 d none usr/lib 755 root bin
-d none usr/lib/python2.4 755 root bin
-d none usr/lib/python2.4/vendor-packages 755 root bin
-d none usr/lib/python2.4/vendor-packages/OpenSSL 755 root bin
-f none usr/lib/python2.4/vendor-packages/OpenSSL/SSL.so 755 root bin
-f none usr/lib/python2.4/vendor-packages/OpenSSL/__init__.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/OpenSSL/__init__.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/OpenSSL/crypto.so 755 root bin
-f none usr/lib/python2.4/vendor-packages/OpenSSL/rand.so 755 root bin
-d none usr/lib/python2.4/vendor-packages/OpenSSL/test 755 root bin
-f none usr/lib/python2.4/vendor-packages/OpenSSL/test/__init__.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/OpenSSL/test/__init__.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/OpenSSL/test/test_crypto.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/OpenSSL/test/test_crypto.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/OpenSSL/test/test_ssl.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/OpenSSL/test/test_ssl.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/OpenSSL/tsafe.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/OpenSSL/tsafe.pyc 444 root bin
-f none usr/lib/python2.4/vendor-packages/OpenSSL/version.py 444 root bin
-f none usr/lib/python2.4/vendor-packages/OpenSSL/version.pyc 444 root bin
+d none usr/lib/python2.6 755 root bin
+d none usr/lib/python2.6/vendor-packages 755 root bin
+d none usr/lib/python2.6/vendor-packages/OpenSSL 755 root bin
+f none usr/lib/python2.6/vendor-packages/OpenSSL/SSL.so 755 root bin
+f none usr/lib/python2.6/vendor-packages/OpenSSL/__init__.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/OpenSSL/__init__.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/OpenSSL/crypto.so 755 root bin
+f none usr/lib/python2.6/vendor-packages/OpenSSL/rand.so 755 root bin
+d none usr/lib/python2.6/vendor-packages/OpenSSL/test 755 root bin
+f none usr/lib/python2.6/vendor-packages/OpenSSL/test/__init__.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/OpenSSL/test/__init__.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/OpenSSL/test/test_crypto.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/OpenSSL/test/test_crypto.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/OpenSSL/test/test_ssl.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/OpenSSL/test/test_ssl.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/OpenSSL/tsafe.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/OpenSSL/tsafe.pyc 444 root bin
+f none usr/lib/python2.6/vendor-packages/OpenSSL/version.py 444 root bin
+f none usr/lib/python2.6/vendor-packages/OpenSSL/version.pyc 444 root bin

--- a/src/pkgdep.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/pkgdep.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python2.6
 #
 # CDDL HEADER START
 #

--- a/src/publish.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/publish.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python2.6
 #
 # CDDL HEADER START
 #

--- a/src/pull.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/pull.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python2.6
 #
 # CDDL HEADER START
 #

--- a/src/scripts/pkg.bat	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/scripts/pkg.bat	Mon Nov 30 13:01:40 2009 -0800
@@ -27,7 +27,7 @@
 set CMDSCRIPT=client.py
 set MY_HOME=%~dp0
 set MY_IPS_BASE=%MY_HOME%\..\..
-set PYTHONPATH=%PYTHONPATH%;%MY_IPS_BASE%\usr\lib\python2.4\vendor-packages
+set PYTHONPATH=%PYTHONPATH%;%MY_IPS_BASE%\usr\lib\python2.6\vendor-packages
 set MY_BASE=%MY_HOME%\..\..\..
 set PATH=%MY_BASE%\python;%PATH%
 set PYTHONUNBUFFERED=yes

--- a/src/scripts/pkg.depotd.bat	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/scripts/pkg.depotd.bat	Mon Nov 30 13:01:40 2009 -0800
@@ -27,7 +27,7 @@
 set CMDSCRIPT=depot.py
 set MY_HOME=%~dp0
 set MY_IPS_BASE=%MY_HOME%\..\..
-set PYTHONPATH=%PYTHONPATH%;%MY_IPS_BASE%\usr\lib\python2.4\vendor-packages
+set PYTHONPATH=%PYTHONPATH%;%MY_IPS_BASE%\usr\lib\python2.6\vendor-packages
 set MY_BASE=%MY_HOME%\..\..\..
 set PATH=%MY_BASE%\python;%PATH%
 set PYTHONUNBUFFERED=yes

--- a/src/scripts/pkg.depotd.sh	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/scripts/pkg.depotd.sh	Mon Nov 30 13:01:40 2009 -0800
@@ -55,12 +55,12 @@
 my_ips_base=`cd ${my_home}/../..; pwd`
 LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${my_ips_base}/usr/lib:/usr/sfw/lib
 PYTHONHOME=${my_base}/python
-PYTHONPATH=${PYTHONPATH}:${my_ips_base}/usr/lib/python2.4/vendor-packages
+PYTHONPATH=${PYTHONPATH}:${my_ips_base}/usr/lib/python2.6/vendor-packages
 PKG_REPO=${my_base}/var/pkg/repo
 PKG_HOME=${my_ips_base}/usr
 export LD_LIBRARY_PATH PYTHONHOME PYTHONPATH PKG_REPO PKG_HOME
-if [ -x ${my_base}/python/bin/python2.4 ] ; then
-  PYEXE=${my_base}/python/bin/python2.4
+if [ -x ${my_base}/python/bin/python2.6 ] ; then
+  PYEXE=${my_base}/python/bin/python2.6
 else
   PYEXE=`which python`
   unset PYTHONHOME

--- a/src/scripts/pkg.sh	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/scripts/pkg.sh	Mon Nov 30 13:01:40 2009 -0800
@@ -55,11 +55,11 @@
 my_ips_base=`cd ${my_home}/../..; pwd`
 LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${my_ips_base}/usr/lib
 PYTHONHOME=${my_base}/python
-PYTHONPATH=${PYTHONPATH}:${my_ips_base}/usr/lib/python2.4/vendor-packages
+PYTHONPATH=${PYTHONPATH}:${my_ips_base}/usr/lib/python2.6/vendor-packages
 PKG_HOME=${my_ips_base}/usr
 export LD_LIBRARY_PATH PYTHONHOME PYTHONPATH PKG_HOME
-if [ -x ${my_base}/python/bin/python2.4 ] ; then
-  PYEXE=${my_base}/python/bin/python2.4
+if [ -x ${my_base}/python/bin/python2.6 ] ; then
+  PYEXE=${my_base}/python/bin/python2.6
 else
   PYEXE=`which python`
   unset PYTHONHOME

--- a/src/scripts/pkgrecv.bat	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/scripts/pkgrecv.bat	Mon Nov 30 13:01:40 2009 -0800
@@ -27,7 +27,7 @@
 set CMDSCRIPT=pull.py
 set MY_HOME=%~dp0
 set MY_IPS_BASE=%MY_HOME%\..\..
-set PYTHONPATH=%PYTHONPATH%;%MY_IPS_BASE%\usr\lib\python2.4\vendor-packages
+set PYTHONPATH=%PYTHONPATH%;%MY_IPS_BASE%\usr\lib\python2.6\vendor-packages
 set MY_BASE=%MY_HOME%\..\..\..
 set PATH=%MY_BASE%\python;%PATH%
 set PYTHONUNBUFFERED=yes

--- a/src/scripts/pkgrecv.sh	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/scripts/pkgrecv.sh	Mon Nov 30 13:01:40 2009 -0800
@@ -55,11 +55,11 @@
 my_ips_base=`cd ${my_home}/../..; pwd`
 LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${my_ips_base}/usr/lib
 PYTHONHOME=${my_base}/python
-PYTHONPATH=${PYTHONPATH}:${my_ips_base}/usr/lib/python2.4/vendor-packages
+PYTHONPATH=${PYTHONPATH}:${my_ips_base}/usr/lib/python2.6/vendor-packages
 PKG_HOME=${my_ips_base}/usr
 export LD_LIBRARY_PATH PYTHONHOME PYTHONPATH PKG_HOME
-if [ -x ${my_base}/python/bin/python2.4 ] ; then
-  PYEXE=${my_base}/python/bin/python2.4
+if [ -x ${my_base}/python/bin/python2.6 ] ; then
+  PYEXE=${my_base}/python/bin/python2.6
 else
   PYEXE=`which python`
   unset PYTHONHOME

--- a/src/scripts/pkgsend.bat	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/scripts/pkgsend.bat	Mon Nov 30 13:01:40 2009 -0800
@@ -27,7 +27,7 @@
 set CMDSCRIPT=publish.py
 set MY_HOME=%~dp0
 set MY_IPS_BASE=%MY_HOME%\..\..
-set PYTHONPATH=%PYTHONPATH%;%MY_IPS_BASE%\usr\lib\python2.4\vendor-packages
+set PYTHONPATH=%PYTHONPATH%;%MY_IPS_BASE%\usr\lib\python2.6\vendor-packages
 set MY_BASE=%MY_HOME%\..\..\..
 set PATH=%MY_BASE%\python;%PATH%
 set PYTHONUNBUFFERED=yes

--- a/src/scripts/pkgsend.sh	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/scripts/pkgsend.sh	Mon Nov 30 13:01:40 2009 -0800
@@ -55,11 +55,11 @@
 my_ips_base=`cd ${my_home}/../..; pwd`
 LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${my_ips_base}/usr/lib
 PYTHONHOME=${my_base}/python
-PYTHONPATH=${PYTHONPATH}:${my_ips_base}/usr/lib/python2.4/vendor-packages
+PYTHONPATH=${PYTHONPATH}:${my_ips_base}/usr/lib/python2.6/vendor-packages
 PKG_HOME=${my_ips_base}/usr
 export LD_LIBRARY_PATH PYTHONHOME PYTHONPATH PKG_HOME
-if [ -x ${my_base}/python/bin/python2.4 ] ; then
-  PYEXE=${my_base}/python/bin/python2.4
+if [ -x ${my_base}/python/bin/python2.6 ] ; then
+  PYEXE=${my_base}/python/bin/python2.6
 else
   PYEXE=`which python`
   unset PYTHONHOME

--- a/src/setup.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/setup.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python2.6
 #
 # CDDL HEADER START
 #
@@ -36,7 +36,7 @@
 import tempfile
 import urllib
 import py_compile
-import sha
+import hashlib
 
 from distutils.errors import DistutilsError
 from distutils.core import setup, Extension
@@ -55,11 +55,11 @@
 # 3rd party software required for the build
 CP = 'CherryPy'
 CPIDIR = 'cherrypy'
-CPVER = '3.1.1'
+CPVER = '3.1.2'
 CPARC = '%s-%s.tar.gz' % (CP, CPVER)
 CPDIR = '%s-%s' % (CP, CPVER)
 CPURL = 'http://download.cherrypy.org/cherrypy/%s/%s' % (CPVER, CPARC)
-CPHASH = '0a8aace00ea28adc05edd41e20dd910042e6d265'
+CPHASH = 'a94aedfd0e675858dbcc32dd250c23d285ee9b88'
 
 PO = 'pyOpenSSL'
 POIDIR = 'OpenSSL'
@@ -152,7 +152,7 @@
 cacert_dir = os.path.normpath(os.path.join(pwd, "cacert"))
 cacert_install_dir = 'usr/share/pkg/cacert'
 
-py_install_dir = 'usr/lib/python2.4/vendor-packages'
+py_install_dir = 'usr/lib/python2.6/vendor-packages'
 
 scripts_dir = 'usr/bin'
 lib_dir = 'usr/lib'
@@ -492,7 +492,7 @@
                 return True
 
         print "checksumming %s" % swname
-        hash = sha.new()
+        hash = hashlib.sha1()
         f = open(swarc, "rb")
         while True:
                 data = f.read(65536)
@@ -614,7 +614,7 @@
         swinst_dir = os.path.join(root_dir, py_install_dir, swidir)
         if not os.path.exists(swinst_dir):
                 print "installing %s" % swname
-                args = ['python', 'setup.py', 'install',
+                args = ['python2.6', 'setup.py', 'install',
                     '--root=%s' % root_dir,
                     '--install-lib=%s' % py_install_dir,
                     '--install-data=%s' % py_install_dir]
@@ -869,8 +869,8 @@
             elf_libraries += [ 'ssl' ]
 
 setup(cmdclass = cmdclasses,
-    name = 'ips',
-    version = '1.0',
+    name = 'pkg',
+    version = '0.1',
     package_dir = {'pkg':'modules'},
     packages = packages,
     data_files = data_files,

--- a/src/tests/api/__init__.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/tests/api/__init__.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #

--- a/src/tests/api/t_action.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/tests/api/t_action.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #

--- a/src/tests/api/t_bootenv.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/tests/api/t_bootenv.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #

--- a/src/tests/api/t_catalog.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/tests/api/t_catalog.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 # -*- coding: utf-8 -*-
 #
 # CDDL HEADER START

--- a/src/tests/api/t_client.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/tests/api/t_client.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python2.6
 # -*- coding: utf-8 -*-
 #
 # CDDL HEADER START

--- a/src/tests/api/t_dependencies.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/tests/api/t_dependencies.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #
@@ -23,6 +23,10 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 
+import cli.testutils as testutils
+if __name__ == "__main__":
+        testutils.setup_environment("../../../proto")
+
 import os
 import shutil
 import sys
@@ -77,7 +81,7 @@
 file NOHASH group=bin mode=0755 owner=root path=usr/xpg4/lib/libcurses.so.1
 """
         ext_python_manf = """ \
-file NOHASH group=bin mode=0755 owner=root path=usr/lib/python2.4/vendor-packages/pkg/client/indexer.py
+file NOHASH group=bin mode=0755 owner=root path=usr/lib/python2.6/vendor-packages/pkg/client/indexer.py
 """
         variant_manf_1 = """ \
 set name=variant.arch value=foo value=bar value=baz
@@ -295,12 +299,12 @@
 
                 def _check_all_res(res):
                         ds, es, ms = res
-                        expected_deps = set(["usr/bin/python2.4",
-                            "usr/lib/python2.4/vendor-packages/pkg/" +
+                        expected_deps = set(["usr/bin/python",
+                            "usr/lib/python2.6/vendor-packages/pkg/" +
                             "__init__.py",
-                            "usr/lib/python2.4/vendor-packages/pkg/indexer.py",
-                            "usr/lib/python2.4/vendor-packages/pkg/misc.py",
-                            "usr/lib/python2.4/vendor-packages/pkg/" +
+                            "usr/lib/python2.6/vendor-packages/pkg/indexer.py",
+                            "usr/lib/python2.6/vendor-packages/pkg/misc.py",
+                            "usr/lib/python2.6/vendor-packages/pkg/" +
                             "search_storage.py"])
                         self.assert_(len(es) == 0 and len(ms) == 0)
                         self.assertEqual(len(ds), len(expected_deps))
@@ -312,15 +316,16 @@
                                 expected_deps.remove(d.dep_key())
                                 self.assertEqual(
                                         d.action.attrs["path"],
-                                        "usr/lib/python2.4/vendor-packages/"
+                                        "usr/lib/python2.6/vendor-packages/"
                                         "pkg/client/indexer.py")
+                self.__debug = True
                 t_path = None
                 try:
                         t_path = self.make_manifest(self.ext_python_manf)
                         _check_all_res(dependencies.list_implicit_deps(t_path,
-                            "/"))
+                            testutils.g_proto_area))
                         _check_all_res(dependencies.list_implicit_deps(t_path,
-                            "/", remove_internal_deps=False))
+                            testutils.g_proto_area))
                 finally:
                         if t_path:
                                 portable.remove(t_path)

--- a/src/tests/api/t_elf.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/tests/api/t_elf.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #

--- a/src/tests/api/t_fmri.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/tests/api/t_fmri.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #

--- a/src/tests/api/t_history.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/tests/api/t_history.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #

--- a/src/tests/api/t_imageconfig.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/tests/api/t_imageconfig.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #

--- a/src/tests/api/t_manifest.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/tests/api/t_manifest.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #

--- a/src/tests/api/t_misc.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/tests/api/t_misc.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #

--- a/src/tests/api/t_p5i.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/tests/api/t_p5i.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #

--- a/src/tests/api/t_pkgtarfile.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/tests/api/t_pkgtarfile.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #

--- a/src/tests/api/t_plat.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/tests/api/t_plat.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #

--- a/src/tests/api/t_publisher.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/tests/api/t_publisher.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #

--- a/src/tests/api/t_repositoryconfig.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/tests/api/t_repositoryconfig.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #

--- a/src/tests/api/t_smf.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/tests/api/t_smf.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #

--- a/src/tests/api/t_unix_usergrp.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/tests/api/t_unix_usergrp.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #

--- a/src/tests/api/t_variant.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/tests/api/t_variant.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #

--- a/src/tests/api/t_version.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/tests/api/t_version.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #

--- a/src/tests/baseline.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/tests/baseline.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #

--- a/src/tests/baseline.txt	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/tests/baseline.txt	Mon Nov 30 13:01:40 2009 -0800
@@ -542,10 +542,10 @@
 cli.t_pkg_version.py TestPkgVersion.test_pkg_version_bad_opts|pass
 cli.t_pkgdep.py TestPkgdepBasics.test_bug_10518|pass
 cli.t_pkgdep.py TestPkgdepBasics.test_bug_11517|pass
-cli.t_pkgdep.py TestPkgdepBasics.test_bug_11805|pass
+cli.t_pkgdep.py TestPkgdepBasics.test_bug_11805|fail
 cli.t_pkgdep.py TestPkgdepBasics.test_bug_11829|pass
 cli.t_pkgdep.py TestPkgdepBasics.test_opts|pass
-cli.t_pkgdep.py TestPkgdepBasics.test_output|pass
+cli.t_pkgdep.py TestPkgdepBasics.test_output|fail
 cli.t_pkgdep.py TestPkgdepBasics.test_resolve_screen_out|pass
 cli.t_pkgdep_resolve.py TestApiDependencies.test_bug_11518|pass
 cli.t_pkgdep_resolve.py TestApiDependencies.test_resolve_cross_package|pass

--- a/src/tests/cli/__init__.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/tests/cli/__init__.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #

--- a/src/tests/cli/t_actuators.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/tests/cli/t_actuators.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #

--- a/src/tests/cli/t_api.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/tests/cli/t_api.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #

--- a/src/tests/cli/t_api_info.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/tests/cli/t_api_info.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #

--- a/src/tests/cli/t_api_search.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/tests/cli/t_api_search.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #
@@ -56,7 +56,7 @@
             open [email protected],5.11-0
             add dir mode=0755 owner=root group=bin path=/bin
             add dir mode=0755 owner=root group=bin path=/bin/example_dir
-            add dir mode=0755 owner=root group=bin path=/usr/lib/python2.4/vendor-packages/OpenSSL
+            add dir mode=0755 owner=root group=bin path=/usr/lib/python2.6/vendor-packages/OpenSSL
             add file /tmp/example_file mode=0555 owner=root group=bin path=/bin/example_path
             add set name=com.sun.service.incorporated_changes value="6556919 6627937"
             add set name=com.sun.service.random_test value=42 value=79
@@ -158,7 +158,7 @@
         ])
 
         res_remote_openssl = set([
-            ("pkg:/[email protected]", "basename", "dir group=bin mode=0755 owner=root path=usr/lib/python2.4/vendor-packages/OpenSSL")
+            ("pkg:/[email protected]", "basename", "dir group=bin mode=0755 owner=root path=usr/lib/python2.6/vendor-packages/OpenSSL")
         ])
 
         res_remote_bug_id = set([

--- a/src/tests/cli/t_fix.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/tests/cli/t_fix.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #

--- a/src/tests/cli/t_pkg_R_option.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/tests/cli/t_pkg_R_option.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #

--- a/src/tests/cli/t_pkg_api_install.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/tests/cli/t_pkg_api_install.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #

--- a/src/tests/cli/t_pkg_contents.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/tests/cli/t_pkg_contents.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #

--- a/src/tests/cli/t_pkg_depotd.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/tests/cli/t_pkg_depotd.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #

--- a/src/tests/cli/t_pkg_help.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/tests/cli/t_pkg_help.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #

--- a/src/tests/cli/t_pkg_history.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/tests/cli/t_pkg_history.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #

--- a/src/tests/cli/t_pkg_image_create.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/tests/cli/t_pkg_image_create.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #

--- a/src/tests/cli/t_pkg_image_update.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/tests/cli/t_pkg_image_update.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #

--- a/src/tests/cli/t_pkg_info.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/tests/cli/t_pkg_info.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #

--- a/src/tests/cli/t_pkg_intent.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/tests/cli/t_pkg_intent.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #

--- a/src/tests/cli/t_pkg_list.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/tests/cli/t_pkg_list.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #

--- a/src/tests/cli/t_pkg_property.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/tests/cli/t_pkg_property.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #

--- a/src/tests/cli/t_pkg_publisher.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/tests/cli/t_pkg_publisher.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #

--- a/src/tests/cli/t_pkg_rebuild_index.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/tests/cli/t_pkg_rebuild_index.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #

--- a/src/tests/cli/t_pkg_refresh.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/tests/cli/t_pkg_refresh.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #

--- a/src/tests/cli/t_pkg_search.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/tests/cli/t_pkg_search.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #
@@ -51,7 +51,7 @@
             open [email protected],5.11-0
             add dir mode=0755 owner=root group=bin path=/bin
             add dir mode=0755 owner=root group=bin path=/bin/example_dir
-            add dir mode=0755 owner=root group=bin path=/usr/lib/python2.4/vendor-packages/OpenSSL
+            add dir mode=0755 owner=root group=bin path=/usr/lib/python2.6/vendor-packages/OpenSSL
             add file /tmp/example_file mode=0555 owner=root group=bin path=/bin/example_path
             add set name=com.sun.service.incorporated_changes value="6556919 6627937"
             add set name=com.sun.service.random_test value=42 value=79
@@ -94,7 +94,7 @@
 
         res_remote_openssl = set([
             headers,
-            "basename   dir       usr/lib/python2.4/vendor-packages/OpenSSL pkg:/[email protected]\n"
+            "basename   dir       usr/lib/python2.6/vendor-packages/OpenSSL pkg:/[email protected]\n"
         ])
 
         res_remote_bug_id = set([

--- a/src/tests/cli/t_pkg_uninstall.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/tests/cli/t_pkg_uninstall.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #

--- a/src/tests/cli/t_pkg_verify.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/tests/cli/t_pkg_verify.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #

--- a/src/tests/cli/t_pkg_version.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/tests/cli/t_pkg_version.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #

--- a/src/tests/cli/t_pkgdep.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/tests/cli/t_pkgdep.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python2.6
 #
 # CDDL HEADER START
 #
@@ -41,7 +41,7 @@
         test_manf_1 = """\
 hardlink path=baz target=var/log/authlog
 file NOHASH group=bin mode=0755 owner=root \
-path=usr/lib/python2.4/v\
+path=usr/lib/python2.6/v\
 endor-packages/pkg/client/indexer.py
 file NOHA\
 SH group=bin mode=0755 owner=root path=u\
@@ -63,28 +63,28 @@
 
         payload_manf = """\
 hardlink path=usr/baz target=../foo/bar.py
-file usr/lib/python2.4/vendor-packages/pkg/client/indexer.py \
+file usr/lib/python2.6/vendor-packages/pkg/client/indexer.py \
 group=bin mode=0755 owner=root path=foo/bar.py
 """
 
         res_manf_1 = """\
-depend %(depend_debug_prefix)s.file=usr/bin/python2.4 fmri=%(dummy_fmri)s type=require %(depend_debug_prefix)s.reason=usr/lib/python2.4/vendor-packages/pkg/client/indexer.py %(depend_debug_prefix)s.type=script
-depend %(depend_debug_prefix)s.file=usr/lib/python2.4/vendor-packages/pkg/__init__.py fmri=%(dummy_fmri)s type=require %(depend_debug_prefix)s.reason=usr/lib/python2.4/vendor-packages/pkg/client/indexer.py %(depend_debug_prefix)s.type=python
-depend %(depend_debug_prefix)s.file=usr/lib/python2.4/vendor-packages/pkg/indexer.py fmri=%(dummy_fmri)s type=require %(depend_debug_prefix)s.reason=usr/lib/python2.4/vendor-packages/pkg/client/indexer.py %(depend_debug_prefix)s.type=python
-depend %(depend_debug_prefix)s.file=usr/lib/python2.4/vendor-packages/pkg/misc.py fmri=%(dummy_fmri)s type=require %(depend_debug_prefix)s.reason=usr/lib/python2.4/vendor-packages/pkg/client/indexer.py %(depend_debug_prefix)s.type=python
-depend %(depend_debug_prefix)s.file=usr/lib/python2.4/vendor-packages/pkg/search_storage.py fmri=%(dummy_fmri)s type=require %(depend_debug_prefix)s.reason=usr/lib/python2.4/vendor-packages/pkg/client/indexer.py %(depend_debug_prefix)s.type=python
+depend %(depend_debug_prefix)s.file=usr/bin/python2.6 fmri=%(dummy_fmri)s type=require %(depend_debug_prefix)s.reason=usr/lib/python2.6/vendor-packages/pkg/client/indexer.py %(depend_debug_prefix)s.type=script
+depend %(depend_debug_prefix)s.file=usr/lib/python2.6/vendor-packages/pkg/__init__.py fmri=%(dummy_fmri)s type=require %(depend_debug_prefix)s.reason=usr/lib/python2.6/vendor-packages/pkg/client/indexer.py %(depend_debug_prefix)s.type=python
+depend %(depend_debug_prefix)s.file=usr/lib/python2.6/vendor-packages/pkg/indexer.py fmri=%(dummy_fmri)s type=require %(depend_debug_prefix)s.reason=usr/lib/python2.6/vendor-packages/pkg/client/indexer.py %(depend_debug_prefix)s.type=python
+depend %(depend_debug_prefix)s.file=usr/lib/python2.6/vendor-packages/pkg/misc.py fmri=%(dummy_fmri)s type=require %(depend_debug_prefix)s.reason=usr/lib/python2.6/vendor-packages/pkg/client/indexer.py %(depend_debug_prefix)s.type=python
+depend %(depend_debug_prefix)s.file=usr/lib/python2.6/vendor-packages/pkg/search_storage.py fmri=%(dummy_fmri)s type=require %(depend_debug_prefix)s.reason=usr/lib/python2.6/vendor-packages/pkg/client/indexer.py %(depend_debug_prefix)s.type=python
 depend %(depend_debug_prefix)s.file=var/log/authlog fmri=%(dummy_fmri)s type=require %(depend_debug_prefix)s.reason=baz %(depend_debug_prefix)s.type=hardlink
 """ % {"depend_debug_prefix":base.Dependency.DEPEND_DEBUG_PREFIX, "dummy_fmri":base.Dependency.DUMMY_FMRI}
 
         res_full_manf_1 = """\
 hardlink path=baz target=var/log/authlog
-file NOHASH group=bin mode=0755 owner=root path=usr/lib/python2.4/vendor-packages/pkg/client/indexer.py
+file NOHASH group=bin mode=0755 owner=root path=usr/lib/python2.6/vendor-packages/pkg/client/indexer.py
 file NOHASH group=bin mode=0755 owner=root path=usr/xpg4/lib/libcurses.so.1
-depend %(depend_debug_prefix)s.file=usr/bin/python2.4 fmri=%(dummy_fmri)s type=require %(depend_debug_prefix)s.reason=usr/lib/python2.4/vendor-packages/pkg/client/indexer.py %(depend_debug_prefix)s.type=script
-depend %(depend_debug_prefix)s.file=usr/lib/python2.4/vendor-packages/pkg/__init__.py fmri=%(dummy_fmri)s type=require %(depend_debug_prefix)s.reason=usr/lib/python2.4/vendor-packages/pkg/client/indexer.py %(depend_debug_prefix)s.type=python
-depend %(depend_debug_prefix)s.file=usr/lib/python2.4/vendor-packages/pkg/indexer.py fmri=%(dummy_fmri)s type=require %(depend_debug_prefix)s.reason=usr/lib/python2.4/vendor-packages/pkg/client/indexer.py %(depend_debug_prefix)s.type=python
-depend %(depend_debug_prefix)s.file=usr/lib/python2.4/vendor-packages/pkg/misc.py fmri=%(dummy_fmri)s type=require %(depend_debug_prefix)s.reason=usr/lib/python2.4/vendor-packages/pkg/client/indexer.py %(depend_debug_prefix)s.type=python
-depend %(depend_debug_prefix)s.file=usr/lib/python2.4/vendor-packages/pkg/search_storage.py fmri=%(dummy_fmri)s type=require %(depend_debug_prefix)s.reason=usr/lib/python2.4/vendor-packages/pkg/client/indexer.py %(depend_debug_prefix)s.type=python
+depend %(depend_debug_prefix)s.file=usr/bin/python2.6 fmri=%(dummy_fmri)s type=require %(depend_debug_prefix)s.reason=usr/lib/python2.6/vendor-packages/pkg/client/indexer.py %(depend_debug_prefix)s.type=script
+depend %(depend_debug_prefix)s.file=usr/lib/python2.6/vendor-packages/pkg/__init__.py fmri=%(dummy_fmri)s type=require %(depend_debug_prefix)s.reason=usr/lib/python2.6/vendor-packages/pkg/client/indexer.py %(depend_debug_prefix)s.type=python
+depend %(depend_debug_prefix)s.file=usr/lib/python2.6/vendor-packages/pkg/indexer.py fmri=%(dummy_fmri)s type=require %(depend_debug_prefix)s.reason=usr/lib/python2.6/vendor-packages/pkg/client/indexer.py %(depend_debug_prefix)s.type=python
+depend %(depend_debug_prefix)s.file=usr/lib/python2.6/vendor-packages/pkg/misc.py fmri=%(dummy_fmri)s type=require %(depend_debug_prefix)s.reason=usr/lib/python2.6/vendor-packages/pkg/client/indexer.py %(depend_debug_prefix)s.type=python
+depend %(depend_debug_prefix)s.file=usr/lib/python2.6/vendor-packages/pkg/search_storage.py fmri=%(dummy_fmri)s type=require %(depend_debug_prefix)s.reason=usr/lib/python2.6/vendor-packages/pkg/client/indexer.py %(depend_debug_prefix)s.type=python
 depend %(depend_debug_prefix)s.file=var/log/authlog fmri=%(dummy_fmri)s type=require %(depend_debug_prefix)s.reason=baz %(depend_debug_prefix)s.type=hardlink
 """ % {"depend_debug_prefix":base.Dependency.DEPEND_DEBUG_PREFIX, "dummy_fmri":base.Dependency.DUMMY_FMRI}
 
@@ -107,11 +107,11 @@
 """
 
         test_manf_1_resolved = """\
-depend fmri=%(py_pkg_name)s %(depend_debug_prefix)s.file=usr/bin/python2.4 %(depend_debug_prefix)s.reason=usr/lib/python2.4/vendor-packages/pkg/client/indexer.py %(depend_debug_prefix)s.type=script type=require
-depend fmri=%(ips_pkg_name)s %(depend_debug_prefix)s.file=usr/lib/python2.4/vendor-packages/pkg/__init__.py %(depend_debug_prefix)s.reason=usr/lib/python2.4/vendor-packages/pkg/client/indexer.py %(depend_debug_prefix)s.type=python type=require
-depend fmri=%(ips_pkg_name)s %(depend_debug_prefix)s.file=usr/lib/python2.4/vendor-packages/pkg/indexer.py %(depend_debug_prefix)s.reason=usr/lib/python2.4/vendor-packages/pkg/client/indexer.py %(depend_debug_prefix)s.type=python type=require
-depend fmri=%(ips_pkg_name)s %(depend_debug_prefix)s.file=usr/lib/python2.4/vendor-packages/pkg/misc.py %(depend_debug_prefix)s.reason=usr/lib/python2.4/vendor-packages/pkg/client/indexer.py %(depend_debug_prefix)s.type=python type=require
-depend fmri=%(ips_pkg_name)s %(depend_debug_prefix)s.file=usr/lib/python2.4/vendor-packages/pkg/search_storage.py %(depend_debug_prefix)s.reason=usr/lib/python2.4/vendor-packages/pkg/client/indexer.py %(depend_debug_prefix)s.type=python type=require
+depend fmri=%(py_pkg_name)s %(depend_debug_prefix)s.file=usr/bin/python2.6 %(depend_debug_prefix)s.reason=usr/lib/python2.6/vendor-packages/pkg/client/indexer.py %(depend_debug_prefix)s.type=script type=require
+depend fmri=%(ips_pkg_name)s %(depend_debug_prefix)s.file=usr/lib/python2.6/vendor-packages/pkg/__init__.py %(depend_debug_prefix)s.reason=usr/lib/python2.6/vendor-packages/pkg/client/indexer.py %(depend_debug_prefix)s.type=python type=require
+depend fmri=%(ips_pkg_name)s %(depend_debug_prefix)s.file=usr/lib/python2.6/vendor-packages/pkg/indexer.py %(depend_debug_prefix)s.reason=usr/lib/python2.6/vendor-packages/pkg/client/indexer.py %(depend_debug_prefix)s.type=python type=require
+depend fmri=%(ips_pkg_name)s %(depend_debug_prefix)s.file=usr/lib/python2.6/vendor-packages/pkg/misc.py %(depend_debug_prefix)s.reason=usr/lib/python2.6/vendor-packages/pkg/client/indexer.py %(depend_debug_prefix)s.type=python type=require
+depend fmri=%(ips_pkg_name)s %(depend_debug_prefix)s.file=usr/lib/python2.6/vendor-packages/pkg/search_storage.py %(depend_debug_prefix)s.reason=usr/lib/python2.6/vendor-packages/pkg/client/indexer.py %(depend_debug_prefix)s.type=python type=require
 depend fmri=%(resolve_name)s %(depend_debug_prefix)s.file=var/log/authlog %(depend_debug_prefix)s.reason=baz %(depend_debug_prefix)s.type=hardlink type=require
 depend fmri=%(csl_pkg_name)s %(depend_debug_prefix)s.file=libc.so.1 %(depend_debug_prefix)s.path=lib %(depend_debug_prefix)s.path=usr/lib %(depend_debug_prefix)s.reason=usr/xpg4/lib/libcurses.so.1 %(depend_debug_prefix)s.type=elf type=require
 """
@@ -123,11 +123,11 @@
 """ % {"depend_debug_prefix":base.Dependency.DEPEND_DEBUG_PREFIX, "dummy_fmri":base.Dependency.DUMMY_FMRI}
 
         res_payload_1 = """\
-depend %(depend_debug_prefix)s.file=usr/bin/python2.4 fmri=%(dummy_fmri)s type=require %(depend_debug_prefix)s.reason=foo/bar.py %(depend_debug_prefix)s.type=script
-depend %(depend_debug_prefix)s.file=usr/lib/python2.4/vendor-packages/pkg/__init__.py fmri=%(dummy_fmri)s type=require %(depend_debug_prefix)s.reason=foo/bar.py %(depend_debug_prefix)s.type=python
-depend %(depend_debug_prefix)s.file=usr/lib/python2.4/vendor-packages/pkg/indexer.py fmri=%(dummy_fmri)s type=require %(depend_debug_prefix)s.reason=foo/bar.py %(depend_debug_prefix)s.type=python
-depend %(depend_debug_prefix)s.file=usr/lib/python2.4/vendor-packages/pkg/misc.py fmri=%(dummy_fmri)s type=require %(depend_debug_prefix)s.reason=foo/bar.py %(depend_debug_prefix)s.type=python
-depend %(depend_debug_prefix)s.file=usr/lib/python2.4/vendor-packages/pkg/search_storage.py fmri=%(dummy_fmri)s type=require %(depend_debug_prefix)s.reason=foo/bar.py %(depend_debug_prefix)s.type=python
+depend %(depend_debug_prefix)s.file=usr/bin/python2.6 fmri=%(dummy_fmri)s type=require %(depend_debug_prefix)s.reason=foo/bar.py %(depend_debug_prefix)s.type=script
+depend %(depend_debug_prefix)s.file=usr/lib/python2.6/vendor-packages/pkg/__init__.py fmri=%(dummy_fmri)s type=require %(depend_debug_prefix)s.reason=foo/bar.py %(depend_debug_prefix)s.type=python
+depend %(depend_debug_prefix)s.file=usr/lib/python2.6/vendor-packages/pkg/indexer.py fmri=%(dummy_fmri)s type=require %(depend_debug_prefix)s.reason=foo/bar.py %(depend_debug_prefix)s.type=python
+depend %(depend_debug_prefix)s.file=usr/lib/python2.6/vendor-packages/pkg/misc.py fmri=%(dummy_fmri)s type=require %(depend_debug_prefix)s.reason=foo/bar.py %(depend_debug_prefix)s.type=python
+depend %(depend_debug_prefix)s.file=usr/lib/python2.6/vendor-packages/pkg/search_storage.py fmri=%(dummy_fmri)s type=require %(depend_debug_prefix)s.reason=foo/bar.py %(depend_debug_prefix)s.type=python
 """ % {"depend_debug_prefix":base.Dependency.DEPEND_DEBUG_PREFIX, "dummy_fmri":base.Dependency.DUMMY_FMRI}
 
         two_variant_deps = """\

--- a/src/tests/cli/t_pkgdep_resolve.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/tests/cli/t_pkgdep_resolve.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #
@@ -63,14 +63,14 @@
 file NOHASH group=sys mode=0644 owner=root path=var/log/syslog
 """
         multi_deps = """\
-file NOHASH group=bin mode=0755 owner=root path=usr/lib/python2.4/v-p/pkg/client/indexer.py
-depend fmri=__TBD pkg.debug.depend.file=usr/bin/python2.4 pkg.debug.depend.reason=usr/lib/python2.4/v-p/pkg/client/indexer.py pkg.debug.depend.type=script type=require
-depend fmri=__TBD pkg.debug.depend.file=usr/lib/python2.4/v-p/pkg/misc.py pkg.debug.depend.reason=usr/lib/python2.4/v-p/pkg/client/indexer.py pkg.debug.depend.type=python type=require
+file NOHASH group=bin mode=0755 owner=root path=usr/lib/python2.6/v-p/pkg/client/indexer.py
+depend fmri=__TBD pkg.debug.depend.file=usr/bin/python2.6 pkg.debug.depend.reason=usr/lib/python2.6/v-p/pkg/client/indexer.py pkg.debug.depend.type=script type=require
+depend fmri=__TBD pkg.debug.depend.file=usr/lib/python2.6/v-p/pkg/misc.py pkg.debug.depend.reason=usr/lib/python2.6/v-p/pkg/client/indexer.py pkg.debug.depend.type=python type=require
 """
 
         misc_manf = """\
 set name=fmri value=pkg:/[email protected],5.11-0.117
-file NOHASH group=bin mode=0444 owner=root path=usr/lib/python2.4/v-p/pkg/misc.py
+file NOHASH group=bin mode=0444 owner=root path=usr/lib/python2.6/v-p/pkg/misc.py
 """
 
         simp_manf = """\
@@ -150,7 +150,7 @@
 
                 self.inst_pkg = """\
 open [email protected],5.11-0
-add file %(foo)s mode=0555 owner=root group=bin path=/usr/bin/python2.4
+add file %(foo)s mode=0555 owner=root group=bin path=/usr/bin/python2.6
 close""" % { "foo": os.path.join(self.testdata_dir, "foo") }
 
                 self.var_pkg = """\
@@ -259,11 +259,11 @@
                                 if d.attrs["fmri"] == p2_name:
                                         self.assertEqual(
                                             d.attrs["%s.file" % self.depend_dp],
-                                            "usr/lib/python2.4/v-p/pkg/misc.py")
+                                            "usr/lib/python2.6/v-p/pkg/misc.py")
                                 elif d.attrs["fmri"].startswith(p3_name):
                                         self.assertEqual(
                                             d.attrs["%s.file" % self.depend_dp],
-                                            "usr/bin/python2.4")
+                                            "usr/bin/python2.6")
                                 else:
                                         raise RuntimeError("Got expected fmri "
                                             "%s for in dependency %s" %

--- a/src/tests/cli/t_pkgrecv.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/tests/cli/t_pkgrecv.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #

--- a/src/tests/cli/t_pkgsend.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/tests/cli/t_pkgsend.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #

--- a/src/tests/cli/t_publish_api.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/tests/cli/t_publish_api.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #

--- a/src/tests/cli/t_setUp.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/tests/cli/t_setUp.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #

--- a/src/tests/cli/t_util_merge.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/tests/cli/t_util_merge.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #

--- a/src/tests/cli/t_variants.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/tests/cli/t_variants.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #

--- a/src/tests/cli/testutils.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/tests/cli/testutils.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #
@@ -96,7 +96,7 @@
         # Clean up relative ../../, etc. out of path to proto
         g_proto_area = os.path.realpath(g_proto_area)
 
-        pkgs = "%s/usr/lib/python2.4/vendor-packages" % g_proto_area
+        pkgs = "%s/usr/lib/python2.6/vendor-packages" % g_proto_area
         bins = "%s/usr/bin" % g_proto_area
 
         sys.path.insert(1, pkgs)

--- a/src/tests/gui/__init__.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/tests/gui/__init__.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #

--- a/src/tests/gui/t_pm_addrepo.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/tests/gui/t_pm_addrepo.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #

--- a/src/tests/gui/t_pm_helpabout.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/tests/gui/t_pm_helpabout.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #

--- a/src/tests/gui/t_pm_install_py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/tests/gui/t_pm_install_py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #

--- a/src/tests/gui/t_pm_rmrepo.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/tests/gui/t_pm_rmrepo.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #

--- a/src/tests/gui/t_pm_start.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/tests/gui/t_pm_start.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #

--- a/src/tests/gui/t_pm_uninstall.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/tests/gui/t_pm_uninstall.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #

--- a/src/tests/gui/testutils.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/tests/gui/testutils.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #

--- a/src/tests/memleaks.ksh	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/tests/memleaks.ksh	Mon Nov 30 13:01:40 2009 -0800
@@ -43,7 +43,7 @@
 
 # Add our proto area to the beginning of PYTHONPATH.  This ensures that the
 # developer's personal python lib will be used as needed.
-export PYTHONPATH=$ROOT/usr/lib/python2.4/vendor-packages/:$PYTHONPATH
+export PYTHONPATH=$ROOT/usr/lib/python2.6/vendor-packages/:$PYTHONPATH
 export PATH=$ROOT/usr/bin:$PATH
 
 print -u2 -- \

--- a/src/tests/multiplatform.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/tests/multiplatform.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #

--- a/src/tests/perf/actionbench.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/tests/perf/actionbench.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python2.6
 #
 # CDDL HEADER START
 #

--- a/src/tests/perf/fmribench.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/tests/perf/fmribench.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python2.6
 #
 # CDDL HEADER START
 #

--- a/src/tests/pkg5unittest.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/tests/pkg5unittest.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
 #
 # CDDL HEADER START
 #

--- a/src/tests/run.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/tests/run.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python2.6
 #
 # CDDL HEADER START
 #
@@ -299,7 +299,7 @@
                 os.rename("%s/pkg5" % covdir, ".coverage")
                 shutil.rmtree(covdir)
                 print >> sys.stderr, "Generating html coverage report"
-                vp = cli.testutils.g_proto_area + "/usr/lib/python2.4/vendor-packages"
+                vp = cli.testutils.g_proto_area + "/usr/lib/python2.6/vendor-packages"
                 omits = [
                     # External modules
                     "%s/cherrypy" % vp,

--- a/src/um/Makefile	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/um/Makefile	Mon Nov 30 13:01:40 2009 -0800
@@ -41,7 +41,7 @@
 ROOTICON24SHARE = $(ROOTSHARE)/icons/hicolor/24x24/actions
 ROOTICON36SHARE = $(ROOTSHARE)/icons/hicolor/36x36/actions
 ROOTICON48SHARE = $(ROOTSHARE)/icons/hicolor/48x48/actions
-ROOTPYTHON = $(ROOTUSRLIB)/python2.4
+ROOTPYTHON = $(ROOTUSRLIB)/python2.6
 ROOTPYTHONPKG = $(ROOTPYTHONVENDOR)/pkg/um
 ROOTPYTHONVENDOR = $(ROOTPYTHON)/vendor-packages
 ROOTSCRIPTSSHARE = $(ROOT)/lib/update-manager

--- a/src/updatemanager.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/updatemanager.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python2.6
 #
 # CDDL HEADER START
 #

--- a/src/updatemanagernotifier.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/updatemanagernotifier.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4 
+#!/usr/bin/python2.6
 # 
 # CDDL HEADER START 
 #

--- a/src/util/distro-import/121/common/SUNWipkg	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/util/distro-import/121/common/SUNWipkg	Mon Nov 30 13:01:40 2009 -0800
@@ -7,5 +7,5 @@
 depend [email protected]
 depend [email protected]
 depend [email protected]
-depend SUNWpython24-simplejson
+depend SUNWpython26-simplejson
 end package

--- a/src/util/distro-import/122/common/pkg5-dev	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/util/distro-import/122/common/pkg5-dev	Mon Nov 30 13:01:40 2009 -0800
@@ -1,14 +1,13 @@
 package developer/opensolaris/pkg5
 classification "Development/Distribution Tools"
 summary "Dependencies required to build the pkg(5) project."
-depend SUNWPython-extra
 depend SUNWgnome-common-devel
 depend SUNWgnome-doc-utils
 depend SUNWmercurial
 depend SUNWonbld
 depend SUNWperl584usr
 depend SUNWpkgcmds
-depend SUNWpython-setuptools
+depend SUNWpython26-setuptools
 depend SUNWsprot
 depend SUNWtidy
 depend SUNWxwinc

--- a/src/util/distro-import/Makefile	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/util/distro-import/Makefile	Mon Nov 30 13:01:40 2009 -0800
@@ -109,7 +109,7 @@
 GLOBAL_CHATTRS_128 = $(GLOBAL_CHATTRS_124)
 GLOBAL_CHATTRS = $(GLOBAL_CHATTRS_$(BUILDID))
 
-SOLARIS.PY=PYTHONPATH=$(PROTO_AREA)/usr/lib/python2.4/vendor-packages \
+SOLARIS.PY=PYTHONPATH=$(PROTO_AREA)/usr/lib/python2.6/vendor-packages \
 	./importer.py -b 0.$(BUILDID) $(EXTRA_OPTIONS) -T \*.py \
 	$(GLOBAL_CHATTRS:%= -G %) $(ARCH_DEFINES:%= -m %) \
 	-p $(PROTO_AREA)

--- a/src/util/distro-import/build_entire_incorporation	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/util/distro-import/build_entire_incorporation	Mon Nov 30 13:01:40 2009 -0800
@@ -25,7 +25,7 @@
 # Use is subject to license terms.
 #
 export PATH=../../../proto/root_$(uname -p)/usr/bin:$PATH
-export PYTHONPATH=../../../proto/root_$(uname -p)/usr/lib/python2.4/vendor-packages
+export PYTHONPATH=../../../proto/root_$(uname -p)/usr/lib/python2.6/vendor-packages
 export PACKAGEPATH=../../../packages/i386
 
 TMPFILE=$(mktemp ./temp_redistXXXXXX)

--- a/src/util/distro-import/check_classifications.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/util/distro-import/check_classifications.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python2.6
 #
 # CDDL HEADER START
 #
@@ -154,7 +154,7 @@
             if opt in ("-p", "--proto_dir"):
                 self.proto_dir = val.strip()
                 self.pkg_dir = self.proto_dir + \
-                    "/usr/lib/python2.4/vendor-packages"
+                    "/usr/lib/python2.6/vendor-packages"
                 self.pkg_cmd = self.proto_dir + "/usr/bin/pkg"
             if opt in ("-v", "--verbose"):
                 self.verbose = True

--- a/src/util/distro-import/check_depends.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/util/distro-import/check_depends.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python2.6
 #
 # CDDL HEADER START
 #

--- a/src/util/distro-import/check_install_scripts.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/util/distro-import/check_install_scripts.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python2.6
 #
 # CDDL HEADER START
 #

--- a/src/util/distro-import/clustertoc2import.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/util/distro-import/clustertoc2import.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python2.6
 #
 # CDDL HEADER START
 #

--- a/src/util/distro-import/driver_names.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/util/distro-import/driver_names.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python2.6
 #
 # CDDL HEADER START
 #

--- a/src/util/distro-import/gen_os_files.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/util/distro-import/gen_os_files.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python2.6
 #
 # CDDL HEADER START
 #

--- a/src/util/distro-import/get_file_from_pkg.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/util/distro-import/get_file_from_pkg.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python2.6
 #
 # CDDL HEADER START
 #
@@ -75,7 +75,7 @@
         # Clean up relative ../../, etc. out of path to proto
         g_proto_area = os.path.realpath(g_proto_area)
 
-        pkgs = "%s/usr/lib/python2.4/vendor-packages" % g_proto_area
+        pkgs = "%s/usr/lib/python2.6/vendor-packages" % g_proto_area
 
         sys.path.insert(1, pkgs)

--- a/src/util/distro-import/import_manifest_file	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/util/distro-import/import_manifest_file	Mon Nov 30 13:01:40 2009 -0800
@@ -25,7 +25,7 @@
 # Use is subject to license terms.
 #
 export PATH=../../../proto/root_`uname -p`/usr/bin:$PATH
-export PYTHONPATH=../../../proto/root_`uname -p`/usr/lib/python2.4/vendor-packages
+export PYTHONPATH=../../../proto/root_`uname -p`/usr/lib/python2.6/vendor-packages
 eval `pkgsend open $1`
 pkgsend include $2
 pkgsend close

--- a/src/util/distro-import/importer.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/util/distro-import/importer.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python2.6
 #
 # CDDL HEADER START
 #

--- a/src/util/distro-import/list_build_files.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/util/distro-import/list_build_files.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python2.6
 #
 # CDDL HEADER START
 #

--- a/src/util/distro-import/pkg-gen.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/util/distro-import/pkg-gen.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python2.6
 #
 # CDDL HEADER START
 #

--- a/src/util/distro-import/publish_ips	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/util/distro-import/publish_ips	Mon Nov 30 13:01:40 2009 -0800
@@ -26,7 +26,7 @@
 #
 MACH=$(uname -p)
 export PATH=../../../proto/root_$MACH/usr/bin:$PATH
-export PYTHONPATH=../../../proto/root_$MACH/usr/lib/python2.4/vendor-packages
+export PYTHONPATH=../../../proto/root_$MACH/usr/lib/python2.6/vendor-packages
 
 buildid=$(echo $1 | tr -d '[a-z]')
 pkgname=$2
@@ -91,7 +91,7 @@
 	pkgsend add depend [email protected].$buildid \
 	    type=require
 	pkgsend add depend [email protected].$buildid type=require
-	pkgsend add depend [email protected].$buildid \
+	pkgsend add depend [email protected].$buildid \
 	    type=require
 elif [[ $pkgname == "SUNWipkg-gui" ]]; then
 	pkgsend import $PKG_ARCHIVE/SUNWipkg-gui-data

--- a/src/util/distro-import/solaris.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/util/distro-import/solaris.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python2.6
 #
 # CDDL HEADER START
 #

--- a/src/util/publish/Makefile	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/util/publish/Makefile	Mon Nov 30 13:01:40 2009 -0800
@@ -25,7 +25,7 @@
 REPO=http://localhost:10000
 MERGEDIR=../../../proto/merge
 PROTO=../../../proto/root_$(ARCH)
-PYTHONPATH=$(PROTO)/usr/lib/python2.4/vendor-packages
+PYTHONPATH=$(PROTO)/usr/lib/python2.6/vendor-packages
 SPARC_REPO=http://localhost:10001
 i386_REPO=http://localhost:10002
 EXTRA_ARGS=

--- a/src/util/publish/merge.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/util/publish/merge.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python2.6
 #
 # CDDL HEADER START
 #

--- a/src/util/publish/pkgmogrify.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/util/publish/pkgmogrify.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python2.6
 #
 # CDDL HEADER START
 #

--- a/src/util/publish/update_file_layout.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/util/publish/update_file_layout.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python2.6
 #
 # CDDL HEADER START
 #

--- a/src/util/qual-simulator/Makefile	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/util/qual-simulator/Makefile	Mon Nov 30 13:01:40 2009 -0800
@@ -23,7 +23,7 @@
 # Use is subject to license terms.
 
 run: stats.py
-	python2.4 scenario.py
+	python2.6 scenario.py
 
 stats.py:
 	cp ../../modules/client/transport/stats.py .

--- a/src/util/qual-simulator/scenario.py	Fri Nov 20 12:05:54 2009 -0800
+++ b/src/util/qual-simulator/scenario.py	Mon Nov 30 13:01:40 2009 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2.6
 #
 # CDDL HEADER START
 #

author	Rich Burridge <rich.burridge@sun.com>
	Mon, 30 Nov 2009 13:01:40 -0800
changeset 1516	8c950a3b4171
parent 1515	b987b1a759cb
child 1517	f11f0f78f401

src/Makefile		file \| annotate \| diff \| comparison \| revisions
src/brand/fmri_compare.py		file \| annotate \| diff \| comparison \| revisions
src/brand/pkgcreatezone		file \| annotate \| diff \| comparison \| revisions
src/checkforupdates.py		file \| annotate \| diff \| comparison \| revisions
src/client.py		file \| annotate \| diff \| comparison \| revisions
src/depot.py		file \| annotate \| diff \| comparison \| revisions
src/gui/Makefile		file \| annotate \| diff \| comparison \| revisions
src/gui/modules/__init__.py		file \| annotate \| diff \| comparison \| revisions
src/gui/modules/beadmin.py		file \| annotate \| diff \| comparison \| revisions
src/gui/modules/cache.py		file \| annotate \| diff \| comparison \| revisions
src/gui/modules/enumerations.py		file \| annotate \| diff \| comparison \| revisions
src/gui/modules/imageinfo.py		file \| annotate \| diff \| comparison \| revisions
src/gui/modules/installupdate.py		file \| annotate \| diff \| comparison \| revisions
src/gui/modules/misc.py		file \| annotate \| diff \| comparison \| revisions
src/gui/modules/misc_non_gui.py		file \| annotate \| diff \| comparison \| revisions
src/gui/modules/parseqs.py		file \| annotate \| diff \| comparison \| revisions
src/gui/modules/progress.py		file \| annotate \| diff \| comparison \| revisions
src/gui/modules/repository.py		file \| annotate \| diff \| comparison \| revisions
src/gui/modules/uarenamebe.py		file \| annotate \| diff \| comparison \| revisions
src/gui/modules/webinstall.py		file \| annotate \| diff \| comparison \| revisions
src/launch.py		file \| annotate \| diff \| comparison \| revisions
src/modules/Uuid25.py		file \| annotate \| diff \| comparison \| revisions
src/modules/__init__.py		file \| annotate \| diff \| comparison \| revisions
src/modules/actions/__init__.py		file \| annotate \| diff \| comparison \| revisions
src/modules/actions/attribute.py		file \| annotate \| diff \| comparison \| revisions
src/modules/actions/depend.py		file \| annotate \| diff \| comparison \| revisions
src/modules/actions/directory.py		file \| annotate \| diff \| comparison \| revisions
src/modules/actions/driver.py		file \| annotate \| diff \| comparison \| revisions
src/modules/actions/file.py		file \| annotate \| diff \| comparison \| revisions
src/modules/actions/generic.py		file \| annotate \| diff \| comparison \| revisions
src/modules/actions/group.py		file \| annotate \| diff \| comparison \| revisions
src/modules/actions/hardlink.py		file \| annotate \| diff \| comparison \| revisions
src/modules/actions/legacy.py		file \| annotate \| diff \| comparison \| revisions
src/modules/actions/license.py		file \| annotate \| diff \| comparison \| revisions
src/modules/actions/link.py		file \| annotate \| diff \| comparison \| revisions
src/modules/actions/signature.py		file \| annotate \| diff \| comparison \| revisions
src/modules/actions/unknown.py		file \| annotate \| diff \| comparison \| revisions
src/modules/actions/user.py		file \| annotate \| diff \| comparison \| revisions
src/modules/bundle/DirectoryBundle.py		file \| annotate \| diff \| comparison \| revisions
src/modules/bundle/SolarisPackageDatastreamBundle.py		file \| annotate \| diff \| comparison \| revisions
src/modules/bundle/SolarisPackageDirBundle.py		file \| annotate \| diff \| comparison \| revisions
src/modules/bundle/TarBundle.py		file \| annotate \| diff \| comparison \| revisions
src/modules/bundle/__init__.py		file \| annotate \| diff \| comparison \| revisions
src/modules/catalog.py		file \| annotate \| diff \| comparison \| revisions
src/modules/cfgfiles.py		file \| annotate \| diff \| comparison \| revisions
src/modules/choose.py		file \| annotate \| diff \| comparison \| revisions
src/modules/client/__init__.py		file \| annotate \| diff \| comparison \| revisions
src/modules/client/actuator.py		file \| annotate \| diff \| comparison \| revisions
src/modules/client/api.py		file \| annotate \| diff \| comparison \| revisions
src/modules/client/api_errors.py		file \| annotate \| diff \| comparison \| revisions
src/modules/client/bootenv.py		file \| annotate \| diff \| comparison \| revisions
src/modules/client/debugvalues.py		file \| annotate \| diff \| comparison \| revisions
src/modules/client/history.py		file \| annotate \| diff \| comparison \| revisions
src/modules/client/image.py		file \| annotate \| diff \| comparison \| revisions
src/modules/client/imageconfig.py		file \| annotate \| diff \| comparison \| revisions
src/modules/client/imageplan.py		file \| annotate \| diff \| comparison \| revisions
src/modules/client/imagetypes.py		file \| annotate \| diff \| comparison \| revisions
src/modules/client/indexer.py		file \| annotate \| diff \| comparison \| revisions
src/modules/client/pkgplan.py		file \| annotate \| diff \| comparison \| revisions
src/modules/client/progress.py		file \| annotate \| diff \| comparison \| revisions
src/modules/client/publisher.py		file \| annotate \| diff \| comparison \| revisions
src/modules/client/query_parser.py		file \| annotate \| diff \| comparison \| revisions
src/modules/cpiofile.py		file \| annotate \| diff \| comparison \| revisions
src/modules/dependency.py		file \| annotate \| diff \| comparison \| revisions
src/modules/depotcontroller.py		file \| annotate \| diff \| comparison \| revisions
src/modules/file_layout/__init__.py		file \| annotate \| diff \| comparison \| revisions
src/modules/file_layout/layout.py		file \| annotate \| diff \| comparison \| revisions
src/modules/flavor/__init__.py		file \| annotate \| diff \| comparison \| revisions
src/modules/flavor/base.py		file \| annotate \| diff \| comparison \| revisions
src/modules/flavor/depthlimitedmf.py		file \| annotate \| diff \| comparison \| revisions
src/modules/flavor/elf.py		file \| annotate \| diff \| comparison \| revisions
src/modules/flavor/hardlink.py		file \| annotate \| diff \| comparison \| revisions
src/modules/flavor/python.py		file \| annotate \| diff \| comparison \| revisions
src/modules/flavor/script.py		file \| annotate \| diff \| comparison \| revisions
src/modules/fmri.py		file \| annotate \| diff \| comparison \| revisions
src/modules/indexer.py		file \| annotate \| diff \| comparison \| revisions
src/modules/manifest.py		file \| annotate \| diff \| comparison \| revisions
src/modules/misc.py		file \| annotate \| diff \| comparison \| revisions
src/modules/nrlock.py		file \| annotate \| diff \| comparison \| revisions
src/modules/p5i.py		file \| annotate \| diff \| comparison \| revisions
src/modules/pkgtarfile.py		file \| annotate \| diff \| comparison \| revisions
src/modules/portable/__init__.py		file \| annotate \| diff \| comparison \| revisions
src/modules/portable/os_aix.py		file \| annotate \| diff \| comparison \| revisions
src/modules/portable/os_darwin.py		file \| annotate \| diff \| comparison \| revisions
src/modules/portable/os_sunos.py		file \| annotate \| diff \| comparison \| revisions
src/modules/portable/os_unix.py		file \| annotate \| diff \| comparison \| revisions
src/modules/portable/os_windows.py		file \| annotate \| diff \| comparison \| revisions
src/modules/portable/util.py		file \| annotate \| diff \| comparison \| revisions
src/modules/publish/__init__.py		file \| annotate \| diff \| comparison \| revisions
src/modules/publish/dependencies.py		file \| annotate \| diff \| comparison \| revisions
src/modules/publish/transaction.py		file \| annotate \| diff \| comparison \| revisions
src/modules/query_parser.py		file \| annotate \| diff \| comparison \| revisions
src/modules/search_errors.py		file \| annotate \| diff \| comparison \| revisions
src/modules/search_storage.py		file \| annotate \| diff \| comparison \| revisions
src/modules/server/__init__.py		file \| annotate \| diff \| comparison \| revisions
src/modules/server/api.py		file \| annotate \| diff \| comparison \| revisions
src/modules/server/api_errors.py		file \| annotate \| diff \| comparison \| revisions
src/modules/server/catalog.py		file \| annotate \| diff \| comparison \| revisions
src/modules/server/depot.py		file \| annotate \| diff \| comparison \| revisions
src/modules/server/depotresponse.py		file \| annotate \| diff \| comparison \| revisions
src/modules/server/face.py		file \| annotate \| diff \| comparison \| revisions
src/modules/server/feed.py		file \| annotate \| diff \| comparison \| revisions
src/modules/server/query_parser.py		file \| annotate \| diff \| comparison \| revisions
src/modules/server/repository.py		file \| annotate \| diff \| comparison \| revisions
src/modules/server/repositoryconfig.py		file \| annotate \| diff \| comparison \| revisions
src/modules/server/transaction.py		file \| annotate \| diff \| comparison \| revisions
src/modules/smf.py		file \| annotate \| diff \| comparison \| revisions
src/modules/sysvpkg.py		file \| annotate \| diff \| comparison \| revisions
src/modules/updatelog.py		file \| annotate \| diff \| comparison \| revisions
src/modules/urlhelpers.py		file \| annotate \| diff \| comparison \| revisions
src/modules/variant.py		file \| annotate \| diff \| comparison \| revisions
src/modules/version.py		file \| annotate \| diff \| comparison \| revisions
src/packagemanager.py		file \| annotate \| diff \| comparison \| revisions
src/patch/ldtp/find-python-path.patch		file \| annotate \| diff \| comparison \| revisions
src/pkgdefs/SUNWipkg-gui-data/prototype		file \| annotate \| diff \| comparison \| revisions
src/pkgdefs/SUNWipkg-gui-l10n/prototype		file \| annotate \| diff \| comparison \| revisions
src/pkgdefs/SUNWipkg-gui/prototype		file \| annotate \| diff \| comparison \| revisions
src/pkgdefs/SUNWipkg-um/prototype		file \| annotate \| diff \| comparison \| revisions
src/pkgdefs/SUNWipkg/prototype		file \| annotate \| diff \| comparison \| revisions
src/pkgdefs/SUNWldtp/Makefile		file \| annotate \| diff \| comparison \| revisions
src/pkgdefs/SUNWldtp/prototype		file \| annotate \| diff \| comparison \| revisions
src/pkgdefs/SUNWpython-cherrypy/Makefile		file \| annotate \| diff \| comparison \| revisions
src/pkgdefs/SUNWpython-cherrypy/copyright		file \| annotate \| diff \| comparison \| revisions
src/pkgdefs/SUNWpython-cherrypy/pkginfo		file \| annotate \| diff \| comparison \| revisions
src/pkgdefs/SUNWpython-cherrypy/prototype		file \| annotate \| diff \| comparison \| revisions
src/pkgdefs/SUNWpython-coverage/Makefile		file \| annotate \| diff \| comparison \| revisions
src/pkgdefs/SUNWpython-coverage/prototype		file \| annotate \| diff \| comparison \| revisions
src/pkgdefs/SUNWpython-mako/Makefile		file \| annotate \| diff \| comparison \| revisions
src/pkgdefs/SUNWpython-mako/prototype		file \| annotate \| diff \| comparison \| revisions
src/pkgdefs/SUNWpython-ply/Makefile		file \| annotate \| diff \| comparison \| revisions
src/pkgdefs/SUNWpython-ply/prototype		file \| annotate \| diff \| comparison \| revisions
src/pkgdefs/SUNWpython-pycurl/prototype		file \| annotate \| diff \| comparison \| revisions
src/pkgdefs/SUNWpython-pyopenssl/Makefile		file \| annotate \| diff \| comparison \| revisions
src/pkgdefs/SUNWpython-pyopenssl/prototype		file \| annotate \| diff \| comparison \| revisions
src/pkgdep.py		file \| annotate \| diff \| comparison \| revisions
src/publish.py		file \| annotate \| diff \| comparison \| revisions
src/pull.py		file \| annotate \| diff \| comparison \| revisions
src/scripts/pkg.bat		file \| annotate \| diff \| comparison \| revisions
src/scripts/pkg.depotd.bat		file \| annotate \| diff \| comparison \| revisions
src/scripts/pkg.depotd.sh		file \| annotate \| diff \| comparison \| revisions
src/scripts/pkg.sh		file \| annotate \| diff \| comparison \| revisions
src/scripts/pkgrecv.bat		file \| annotate \| diff \| comparison \| revisions
src/scripts/pkgrecv.sh		file \| annotate \| diff \| comparison \| revisions
src/scripts/pkgsend.bat		file \| annotate \| diff \| comparison \| revisions
src/scripts/pkgsend.sh		file \| annotate \| diff \| comparison \| revisions
src/setup.py		file \| annotate \| diff \| comparison \| revisions
src/tests/api/__init__.py		file \| annotate \| diff \| comparison \| revisions
src/tests/api/t_action.py		file \| annotate \| diff \| comparison \| revisions
src/tests/api/t_bootenv.py		file \| annotate \| diff \| comparison \| revisions
src/tests/api/t_catalog.py		file \| annotate \| diff \| comparison \| revisions
src/tests/api/t_client.py		file \| annotate \| diff \| comparison \| revisions
src/tests/api/t_dependencies.py		file \| annotate \| diff \| comparison \| revisions
src/tests/api/t_elf.py		file \| annotate \| diff \| comparison \| revisions
src/tests/api/t_fmri.py		file \| annotate \| diff \| comparison \| revisions
src/tests/api/t_history.py		file \| annotate \| diff \| comparison \| revisions
src/tests/api/t_imageconfig.py		file \| annotate \| diff \| comparison \| revisions
src/tests/api/t_manifest.py		file \| annotate \| diff \| comparison \| revisions
src/tests/api/t_misc.py		file \| annotate \| diff \| comparison \| revisions
src/tests/api/t_p5i.py		file \| annotate \| diff \| comparison \| revisions
src/tests/api/t_pkgtarfile.py		file \| annotate \| diff \| comparison \| revisions
src/tests/api/t_plat.py		file \| annotate \| diff \| comparison \| revisions
src/tests/api/t_publisher.py		file \| annotate \| diff \| comparison \| revisions
src/tests/api/t_repositoryconfig.py		file \| annotate \| diff \| comparison \| revisions
src/tests/api/t_smf.py		file \| annotate \| diff \| comparison \| revisions
src/tests/api/t_unix_usergrp.py		file \| annotate \| diff \| comparison \| revisions
src/tests/api/t_variant.py		file \| annotate \| diff \| comparison \| revisions
src/tests/api/t_version.py		file \| annotate \| diff \| comparison \| revisions
src/tests/baseline.py		file \| annotate \| diff \| comparison \| revisions
src/tests/baseline.txt		file \| annotate \| diff \| comparison \| revisions
src/tests/cli/__init__.py		file \| annotate \| diff \| comparison \| revisions
src/tests/cli/t_actuators.py		file \| annotate \| diff \| comparison \| revisions
src/tests/cli/t_api.py		file \| annotate \| diff \| comparison \| revisions
src/tests/cli/t_api_info.py		file \| annotate \| diff \| comparison \| revisions
src/tests/cli/t_api_search.py		file \| annotate \| diff \| comparison \| revisions
src/tests/cli/t_fix.py		file \| annotate \| diff \| comparison \| revisions
src/tests/cli/t_pkg_R_option.py		file \| annotate \| diff \| comparison \| revisions
src/tests/cli/t_pkg_api_install.py		file \| annotate \| diff \| comparison \| revisions
src/tests/cli/t_pkg_contents.py		file \| annotate \| diff \| comparison \| revisions
src/tests/cli/t_pkg_depotd.py		file \| annotate \| diff \| comparison \| revisions
src/tests/cli/t_pkg_help.py		file \| annotate \| diff \| comparison \| revisions
src/tests/cli/t_pkg_history.py		file \| annotate \| diff \| comparison \| revisions
src/tests/cli/t_pkg_image_create.py		file \| annotate \| diff \| comparison \| revisions
src/tests/cli/t_pkg_image_update.py		file \| annotate \| diff \| comparison \| revisions
src/tests/cli/t_pkg_info.py		file \| annotate \| diff \| comparison \| revisions
src/tests/cli/t_pkg_intent.py		file \| annotate \| diff \| comparison \| revisions
src/tests/cli/t_pkg_list.py		file \| annotate \| diff \| comparison \| revisions
src/tests/cli/t_pkg_property.py		file \| annotate \| diff \| comparison \| revisions
src/tests/cli/t_pkg_publisher.py		file \| annotate \| diff \| comparison \| revisions
src/tests/cli/t_pkg_rebuild_index.py		file \| annotate \| diff \| comparison \| revisions
src/tests/cli/t_pkg_refresh.py		file \| annotate \| diff \| comparison \| revisions
src/tests/cli/t_pkg_search.py		file \| annotate \| diff \| comparison \| revisions
src/tests/cli/t_pkg_uninstall.py		file \| annotate \| diff \| comparison \| revisions
src/tests/cli/t_pkg_verify.py		file \| annotate \| diff \| comparison \| revisions
src/tests/cli/t_pkg_version.py		file \| annotate \| diff \| comparison \| revisions
src/tests/cli/t_pkgdep.py		file \| annotate \| diff \| comparison \| revisions
src/tests/cli/t_pkgdep_resolve.py		file \| annotate \| diff \| comparison \| revisions
src/tests/cli/t_pkgrecv.py		file \| annotate \| diff \| comparison \| revisions
src/tests/cli/t_pkgsend.py		file \| annotate \| diff \| comparison \| revisions
src/tests/cli/t_publish_api.py		file \| annotate \| diff \| comparison \| revisions
src/tests/cli/t_setUp.py		file \| annotate \| diff \| comparison \| revisions
src/tests/cli/t_util_merge.py		file \| annotate \| diff \| comparison \| revisions
src/tests/cli/t_variants.py		file \| annotate \| diff \| comparison \| revisions
src/tests/cli/testutils.py		file \| annotate \| diff \| comparison \| revisions
src/tests/gui/__init__.py		file \| annotate \| diff \| comparison \| revisions
src/tests/gui/t_pm_addrepo.py		file \| annotate \| diff \| comparison \| revisions
src/tests/gui/t_pm_helpabout.py		file \| annotate \| diff \| comparison \| revisions
src/tests/gui/t_pm_install_py		file \| annotate \| diff \| comparison \| revisions
src/tests/gui/t_pm_rmrepo.py		file \| annotate \| diff \| comparison \| revisions
src/tests/gui/t_pm_start.py		file \| annotate \| diff \| comparison \| revisions
src/tests/gui/t_pm_uninstall.py		file \| annotate \| diff \| comparison \| revisions
src/tests/gui/testutils.py		file \| annotate \| diff \| comparison \| revisions
src/tests/memleaks.ksh		file \| annotate \| diff \| comparison \| revisions
src/tests/multiplatform.py		file \| annotate \| diff \| comparison \| revisions
src/tests/perf/actionbench.py		file \| annotate \| diff \| comparison \| revisions
src/tests/perf/fmribench.py		file \| annotate \| diff \| comparison \| revisions
src/tests/pkg5unittest.py		file \| annotate \| diff \| comparison \| revisions
src/tests/run.py		file \| annotate \| diff \| comparison \| revisions
src/um/Makefile		file \| annotate \| diff \| comparison \| revisions
src/updatemanager.py		file \| annotate \| diff \| comparison \| revisions
src/updatemanagernotifier.py		file \| annotate \| diff \| comparison \| revisions
src/util/distro-import/121/common/SUNWipkg		file \| annotate \| diff \| comparison \| revisions
src/util/distro-import/122/common/pkg5-dev		file \| annotate \| diff \| comparison \| revisions
src/util/distro-import/Makefile		file \| annotate \| diff \| comparison \| revisions
src/util/distro-import/build_entire_incorporation		file \| annotate \| diff \| comparison \| revisions
src/util/distro-import/check_classifications.py		file \| annotate \| diff \| comparison \| revisions
src/util/distro-import/check_depends.py		file \| annotate \| diff \| comparison \| revisions
src/util/distro-import/check_install_scripts.py		file \| annotate \| diff \| comparison \| revisions
src/util/distro-import/clustertoc2import.py		file \| annotate \| diff \| comparison \| revisions
src/util/distro-import/driver_names.py		file \| annotate \| diff \| comparison \| revisions
src/util/distro-import/gen_os_files.py		file \| annotate \| diff \| comparison \| revisions
src/util/distro-import/get_file_from_pkg.py		file \| annotate \| diff \| comparison \| revisions
src/util/distro-import/import_manifest_file		file \| annotate \| diff \| comparison \| revisions
src/util/distro-import/importer.py		file \| annotate \| diff \| comparison \| revisions
src/util/distro-import/list_build_files.py		file \| annotate \| diff \| comparison \| revisions
src/util/distro-import/pkg-gen.py		file \| annotate \| diff \| comparison \| revisions
src/util/distro-import/publish_ips		file \| annotate \| diff \| comparison \| revisions
src/util/distro-import/solaris.py		file \| annotate \| diff \| comparison \| revisions
src/util/publish/Makefile		file \| annotate \| diff \| comparison \| revisions
src/util/publish/merge.py		file \| annotate \| diff \| comparison \| revisions
src/util/publish/pkgmogrify.py		file \| annotate \| diff \| comparison \| revisions
src/util/publish/update_file_layout.py		file \| annotate \| diff \| comparison \| revisions
src/util/qual-simulator/Makefile		file \| annotate \| diff \| comparison \| revisions
src/util/qual-simulator/scenario.py		file \| annotate \| diff \| comparison \| revisions