src/modules/version.py
author Shawn Walker <shawn.walker@oracle.com>
Wed, 26 Jan 2011 19:03:43 -0800
changeset 2199 7ddd3f2cfb0b
parent 1698 83aaa0d436d7
child 2224 dba01788128c
permissions -rw-r--r--
17710 matching version class parsing fails if build version is omitted 16624 pkg(5) should document that leading zeros are illegal in fmris 17711 pkg(5) fmri syntax vague and missing information about optional components
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1516
8c950a3b4171 10485 move pkg(5) to Python 2.6
Rich Burridge <rich.burridge@sun.com>
parents: 933
diff changeset
     1
#!/usr/bin/python
3
f1296620648e reorganize code into a source directory
"Stephen Hahn <sch@sun.com>"
parents:
diff changeset
     2
#
f1296620648e reorganize code into a source directory
"Stephen Hahn <sch@sun.com>"
parents:
diff changeset
     3
# CDDL HEADER START
f1296620648e reorganize code into a source directory
"Stephen Hahn <sch@sun.com>"
parents:
diff changeset
     4
#
f1296620648e reorganize code into a source directory
"Stephen Hahn <sch@sun.com>"
parents:
diff changeset
     5
# The contents of this file are subject to the terms of the
f1296620648e reorganize code into a source directory
"Stephen Hahn <sch@sun.com>"
parents:
diff changeset
     6
# Common Development and Distribution License (the "License").
f1296620648e reorganize code into a source directory
"Stephen Hahn <sch@sun.com>"
parents:
diff changeset
     7
# You may not use this file except in compliance with the License.
f1296620648e reorganize code into a source directory
"Stephen Hahn <sch@sun.com>"
parents:
diff changeset
     8
#
f1296620648e reorganize code into a source directory
"Stephen Hahn <sch@sun.com>"
parents:
diff changeset
     9
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
f1296620648e reorganize code into a source directory
"Stephen Hahn <sch@sun.com>"
parents:
diff changeset
    10
# or http://www.opensolaris.org/os/licensing.
f1296620648e reorganize code into a source directory
"Stephen Hahn <sch@sun.com>"
parents:
diff changeset
    11
# See the License for the specific language governing permissions
f1296620648e reorganize code into a source directory
"Stephen Hahn <sch@sun.com>"
parents:
diff changeset
    12
# and limitations under the License.
f1296620648e reorganize code into a source directory
"Stephen Hahn <sch@sun.com>"
parents:
diff changeset
    13
#
f1296620648e reorganize code into a source directory
"Stephen Hahn <sch@sun.com>"
parents:
diff changeset
    14
# When distributing Covered Code, include this CDDL HEADER in each
f1296620648e reorganize code into a source directory
"Stephen Hahn <sch@sun.com>"
parents:
diff changeset
    15
# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
f1296620648e reorganize code into a source directory
"Stephen Hahn <sch@sun.com>"
parents:
diff changeset
    16
# If applicable, add the following below this CDDL HEADER, with the
f1296620648e reorganize code into a source directory
"Stephen Hahn <sch@sun.com>"
parents:
diff changeset
    17
# fields enclosed by brackets "[]" replaced with your own identifying
f1296620648e reorganize code into a source directory
"Stephen Hahn <sch@sun.com>"
parents:
diff changeset
    18
# information: Portions Copyright [yyyy] [name of copyright owner]
f1296620648e reorganize code into a source directory
"Stephen Hahn <sch@sun.com>"
parents:
diff changeset
    19
#
f1296620648e reorganize code into a source directory
"Stephen Hahn <sch@sun.com>"
parents:
diff changeset
    20
# CDDL HEADER END
f1296620648e reorganize code into a source directory
"Stephen Hahn <sch@sun.com>"
parents:
diff changeset
    21
#
f1296620648e reorganize code into a source directory
"Stephen Hahn <sch@sun.com>"
parents:
diff changeset
    22
f1296620648e reorganize code into a source directory
"Stephen Hahn <sch@sun.com>"
parents:
diff changeset
    23
#
2199
7ddd3f2cfb0b 17710 matching version class parsing fails if build version is omitted
Shawn Walker <shawn.walker@oracle.com>
parents: 1698
diff changeset
    24
# Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
3
f1296620648e reorganize code into a source directory
"Stephen Hahn <sch@sun.com>"
parents:
diff changeset
    25
#
f1296620648e reorganize code into a source directory
"Stephen Hahn <sch@sun.com>"
parents:
diff changeset
    26
852
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
    27
import calendar
59
eef94b0c0694 require dependencies; dependency following; pkg status; timestamp change
Stephen Hahn <sch@sun.com>
parents: 45
diff changeset
    28
import datetime
eef94b0c0694 require dependencies; dependency following; pkg status; timestamp change
Stephen Hahn <sch@sun.com>
parents: 45
diff changeset
    29
import time
1698
83aaa0d436d7 11029 Implement Flyweight pattern and __slots__ to reduce fmri memory usage
johansen <johansen@sun.com>
parents: 1537
diff changeset
    30
import weakref
3
f1296620648e reorganize code into a source directory
"Stephen Hahn <sch@sun.com>"
parents:
diff changeset
    31
30
f06ad6cb4b3f stop using flavour terminology
Stephen Hahn <sch@sun.com>
parents: 26
diff changeset
    32
CONSTRAINT_NONE = 0
175
8d591677690b 22 Specifying a version on the "pkg install" commandline makes no difference
Danek Duvall <danek.duvall@sun.com>
parents: 146
diff changeset
    33
CONSTRAINT_AUTO = 50
30
f06ad6cb4b3f stop using flavour terminology
Stephen Hahn <sch@sun.com>
parents: 26
diff changeset
    34
f06ad6cb4b3f stop using flavour terminology
Stephen Hahn <sch@sun.com>
parents: 26
diff changeset
    35
CONSTRAINT_RELEASE = 100
f06ad6cb4b3f stop using flavour terminology
Stephen Hahn <sch@sun.com>
parents: 26
diff changeset
    36
CONSTRAINT_RELEASE_MAJOR = 101
f06ad6cb4b3f stop using flavour terminology
Stephen Hahn <sch@sun.com>
parents: 26
diff changeset
    37
CONSTRAINT_RELEASE_MINOR = 102
f06ad6cb4b3f stop using flavour terminology
Stephen Hahn <sch@sun.com>
parents: 26
diff changeset
    38
f06ad6cb4b3f stop using flavour terminology
Stephen Hahn <sch@sun.com>
parents: 26
diff changeset
    39
CONSTRAINT_BRANCH = 200
f06ad6cb4b3f stop using flavour terminology
Stephen Hahn <sch@sun.com>
parents: 26
diff changeset
    40
CONSTRAINT_BRANCH_MAJOR = 101
f06ad6cb4b3f stop using flavour terminology
Stephen Hahn <sch@sun.com>
parents: 26
diff changeset
    41
CONSTRAINT_BRANCH_MINOR = 102
f06ad6cb4b3f stop using flavour terminology
Stephen Hahn <sch@sun.com>
parents: 26
diff changeset
    42
f06ad6cb4b3f stop using flavour terminology
Stephen Hahn <sch@sun.com>
parents: 26
diff changeset
    43
CONSTRAINT_SEQUENCE = 300
f06ad6cb4b3f stop using flavour terminology
Stephen Hahn <sch@sun.com>
parents: 26
diff changeset
    44
933
601797170f72 3739 pkg.depotd traceback on malformed requests
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 856
diff changeset
    45
class VersionError(Exception):
601797170f72 3739 pkg.depotd traceback on malformed requests
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 856
diff changeset
    46
        """Base exception class for all version errors."""
601797170f72 3739 pkg.depotd traceback on malformed requests
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 856
diff changeset
    47
416
bbfe37efa018 2344 fmris could be smaller, faster, better
Dan Price <dp@eng.sun.com>
parents: 409
diff changeset
    48
        def __init__(self, *args):
933
601797170f72 3739 pkg.depotd traceback on malformed requests
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 856
diff changeset
    49
                Exception.__init__(self, *args)
601797170f72 3739 pkg.depotd traceback on malformed requests
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 856
diff changeset
    50
3
f1296620648e reorganize code into a source directory
"Stephen Hahn <sch@sun.com>"
parents:
diff changeset
    51
933
601797170f72 3739 pkg.depotd traceback on malformed requests
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 856
diff changeset
    52
class IllegalDotSequence(VersionError):
601797170f72 3739 pkg.depotd traceback on malformed requests
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 856
diff changeset
    53
        """Used to indicate that the specified DotSequence is not valid."""
852
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
    54
416
bbfe37efa018 2344 fmris could be smaller, faster, better
Dan Price <dp@eng.sun.com>
parents: 409
diff changeset
    55
class DotSequence(list):
3
f1296620648e reorganize code into a source directory
"Stephen Hahn <sch@sun.com>"
parents:
diff changeset
    56
        """A DotSequence is the typical "x.y.z" string used in software
f1296620648e reorganize code into a source directory
"Stephen Hahn <sch@sun.com>"
parents:
diff changeset
    57
        versioning.  We define the "major release" value and the "minor release"
f1296620648e reorganize code into a source directory
"Stephen Hahn <sch@sun.com>"
parents:
diff changeset
    58
        value as the first two numbers in the sequence."""
f1296620648e reorganize code into a source directory
"Stephen Hahn <sch@sun.com>"
parents:
diff changeset
    59
1698
83aaa0d436d7 11029 Implement Flyweight pattern and __slots__ to reduce fmri memory usage
johansen <johansen@sun.com>
parents: 1537
diff changeset
    60
        #
83aaa0d436d7 11029 Implement Flyweight pattern and __slots__ to reduce fmri memory usage
johansen <johansen@sun.com>
parents: 1537
diff changeset
    61
        # We employ the Flyweight design pattern for dotsequences, since they
83aaa0d436d7 11029 Implement Flyweight pattern and __slots__ to reduce fmri memory usage
johansen <johansen@sun.com>
parents: 1537
diff changeset
    62
        # are used immutably, are highly repetitive (0.5.11 over and over) and,
83aaa0d436d7 11029 Implement Flyweight pattern and __slots__ to reduce fmri memory usage
johansen <johansen@sun.com>
parents: 1537
diff changeset
    63
        # for what they contain, are relatively expensive memory-wise.
83aaa0d436d7 11029 Implement Flyweight pattern and __slots__ to reduce fmri memory usage
johansen <johansen@sun.com>
parents: 1537
diff changeset
    64
        #
83aaa0d436d7 11029 Implement Flyweight pattern and __slots__ to reduce fmri memory usage
johansen <johansen@sun.com>
parents: 1537
diff changeset
    65
        __dotseq_pool = weakref.WeakValueDictionary()
83aaa0d436d7 11029 Implement Flyweight pattern and __slots__ to reduce fmri memory usage
johansen <johansen@sun.com>
parents: 1537
diff changeset
    66
526
8c243883ae41 822 Depot traceback on "pkgsend -s <server> open foo"
Dan Price <dp@eng.sun.com>
parents: 429
diff changeset
    67
        @staticmethod
852
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
    68
        def dotsequence_val(elem):
526
8c243883ae41 822 Depot traceback on "pkgsend -s <server> open foo"
Dan Price <dp@eng.sun.com>
parents: 429
diff changeset
    69
                # Do this first; if the string is zero chars or non-numeric
8c243883ae41 822 Depot traceback on "pkgsend -s <server> open foo"
Dan Price <dp@eng.sun.com>
parents: 429
diff changeset
    70
                # chars, this will throw.
8c243883ae41 822 Depot traceback on "pkgsend -s <server> open foo"
Dan Price <dp@eng.sun.com>
parents: 429
diff changeset
    71
                x = int(elem)
8c243883ae41 822 Depot traceback on "pkgsend -s <server> open foo"
Dan Price <dp@eng.sun.com>
parents: 429
diff changeset
    72
                if elem[0] == "-":
8c243883ae41 822 Depot traceback on "pkgsend -s <server> open foo"
Dan Price <dp@eng.sun.com>
parents: 429
diff changeset
    73
                        raise ValueError, "Negative number"
8c243883ae41 822 Depot traceback on "pkgsend -s <server> open foo"
Dan Price <dp@eng.sun.com>
parents: 429
diff changeset
    74
                if x > 0 and elem[0] == "0":
8c243883ae41 822 Depot traceback on "pkgsend -s <server> open foo"
Dan Price <dp@eng.sun.com>
parents: 429
diff changeset
    75
                        raise ValueError, "Zero padded number"
8c243883ae41 822 Depot traceback on "pkgsend -s <server> open foo"
Dan Price <dp@eng.sun.com>
parents: 429
diff changeset
    76
                return x
8c243883ae41 822 Depot traceback on "pkgsend -s <server> open foo"
Dan Price <dp@eng.sun.com>
parents: 429
diff changeset
    77
1698
83aaa0d436d7 11029 Implement Flyweight pattern and __slots__ to reduce fmri memory usage
johansen <johansen@sun.com>
parents: 1537
diff changeset
    78
        def __new__(cls, dotstring):
83aaa0d436d7 11029 Implement Flyweight pattern and __slots__ to reduce fmri memory usage
johansen <johansen@sun.com>
parents: 1537
diff changeset
    79
                ds = DotSequence.__dotseq_pool.get(dotstring, None)
83aaa0d436d7 11029 Implement Flyweight pattern and __slots__ to reduce fmri memory usage
johansen <johansen@sun.com>
parents: 1537
diff changeset
    80
                if ds is not None:
83aaa0d436d7 11029 Implement Flyweight pattern and __slots__ to reduce fmri memory usage
johansen <johansen@sun.com>
parents: 1537
diff changeset
    81
                        return ds
83aaa0d436d7 11029 Implement Flyweight pattern and __slots__ to reduce fmri memory usage
johansen <johansen@sun.com>
parents: 1537
diff changeset
    82
83aaa0d436d7 11029 Implement Flyweight pattern and __slots__ to reduce fmri memory usage
johansen <johansen@sun.com>
parents: 1537
diff changeset
    83
                ds = list.__new__(cls)
83aaa0d436d7 11029 Implement Flyweight pattern and __slots__ to reduce fmri memory usage
johansen <johansen@sun.com>
parents: 1537
diff changeset
    84
                cls.__dotseq_pool[dotstring] = ds
83aaa0d436d7 11029 Implement Flyweight pattern and __slots__ to reduce fmri memory usage
johansen <johansen@sun.com>
parents: 1537
diff changeset
    85
                return ds
83aaa0d436d7 11029 Implement Flyweight pattern and __slots__ to reduce fmri memory usage
johansen <johansen@sun.com>
parents: 1537
diff changeset
    86
3
f1296620648e reorganize code into a source directory
"Stephen Hahn <sch@sun.com>"
parents:
diff changeset
    87
        def __init__(self, dotstring):
1698
83aaa0d436d7 11029 Implement Flyweight pattern and __slots__ to reduce fmri memory usage
johansen <johansen@sun.com>
parents: 1537
diff changeset
    88
                # Was I already initialized?  See __new__ above.
83aaa0d436d7 11029 Implement Flyweight pattern and __slots__ to reduce fmri memory usage
johansen <johansen@sun.com>
parents: 1537
diff changeset
    89
                if len(self) != 0:
83aaa0d436d7 11029 Implement Flyweight pattern and __slots__ to reduce fmri memory usage
johansen <johansen@sun.com>
parents: 1537
diff changeset
    90
                        return
83aaa0d436d7 11029 Implement Flyweight pattern and __slots__ to reduce fmri memory usage
johansen <johansen@sun.com>
parents: 1537
diff changeset
    91
146
9b9fcd56b8b2 Reduce use of the re module, for performance.
Danek Duvall <danek.duvall@sun.com>
parents: 122
diff changeset
    92
                try:
526
8c243883ae41 822 Depot traceback on "pkgsend -s <server> open foo"
Dan Price <dp@eng.sun.com>
parents: 429
diff changeset
    93
                        list.__init__(self,
852
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
    94
                            map(DotSequence.dotsequence_val,
526
8c243883ae41 822 Depot traceback on "pkgsend -s <server> open foo"
Dan Price <dp@eng.sun.com>
parents: 429
diff changeset
    95
                                dotstring.split(".")))
146
9b9fcd56b8b2 Reduce use of the re module, for performance.
Danek Duvall <danek.duvall@sun.com>
parents: 122
diff changeset
    96
                except ValueError:
9b9fcd56b8b2 Reduce use of the re module, for performance.
Danek Duvall <danek.duvall@sun.com>
parents: 122
diff changeset
    97
                        raise IllegalDotSequence(dotstring)
3
f1296620648e reorganize code into a source directory
"Stephen Hahn <sch@sun.com>"
parents:
diff changeset
    98
565
1fb4f05220b9 3443 An api needs to be provided for safe interaction of front-ends
Brock Pytlik <bpytlik@sun.com>
parents: 526
diff changeset
    99
                if len(self) == 0:
526
8c243883ae41 822 Depot traceback on "pkgsend -s <server> open foo"
Dan Price <dp@eng.sun.com>
parents: 429
diff changeset
   100
                        raise IllegalDotSequence("Empty DotSequence")
8c243883ae41 822 Depot traceback on "pkgsend -s <server> open foo"
Dan Price <dp@eng.sun.com>
parents: 429
diff changeset
   101
3
f1296620648e reorganize code into a source directory
"Stephen Hahn <sch@sun.com>"
parents:
diff changeset
   102
        def __str__(self):
416
bbfe37efa018 2344 fmris could be smaller, faster, better
Dan Price <dp@eng.sun.com>
parents: 409
diff changeset
   103
                return ".".join(map(str, self))
3
f1296620648e reorganize code into a source directory
"Stephen Hahn <sch@sun.com>"
parents:
diff changeset
   104
429
6c9cbb6e6600 983 pkg search returns just one action per package/token-type combo
Brock Pytlik <bpytlik@sun.com>
parents: 419
diff changeset
   105
        def __hash__(self):
6c9cbb6e6600 983 pkg search returns just one action per package/token-type combo
Brock Pytlik <bpytlik@sun.com>
parents: 419
diff changeset
   106
                return hash(tuple(self))
6c9cbb6e6600 983 pkg search returns just one action per package/token-type combo
Brock Pytlik <bpytlik@sun.com>
parents: 419
diff changeset
   107
30
f06ad6cb4b3f stop using flavour terminology
Stephen Hahn <sch@sun.com>
parents: 26
diff changeset
   108
        def is_subsequence(self, other):
f06ad6cb4b3f stop using flavour terminology
Stephen Hahn <sch@sun.com>
parents: 26
diff changeset
   109
                """Return true if self is a "subsequence" of other, meaning that
f06ad6cb4b3f stop using flavour terminology
Stephen Hahn <sch@sun.com>
parents: 26
diff changeset
   110
                other and self have identical components, up to the length of
f06ad6cb4b3f stop using flavour terminology
Stephen Hahn <sch@sun.com>
parents: 26
diff changeset
   111
                self's sequence."""
f06ad6cb4b3f stop using flavour terminology
Stephen Hahn <sch@sun.com>
parents: 26
diff changeset
   112
416
bbfe37efa018 2344 fmris could be smaller, faster, better
Dan Price <dp@eng.sun.com>
parents: 409
diff changeset
   113
                if len(self) > len(other):
30
f06ad6cb4b3f stop using flavour terminology
Stephen Hahn <sch@sun.com>
parents: 26
diff changeset
   114
                        return False
f06ad6cb4b3f stop using flavour terminology
Stephen Hahn <sch@sun.com>
parents: 26
diff changeset
   115
416
bbfe37efa018 2344 fmris could be smaller, faster, better
Dan Price <dp@eng.sun.com>
parents: 409
diff changeset
   116
                for a, b in zip(self, other):
175
8d591677690b 22 Specifying a version on the "pkg install" commandline makes no difference
Danek Duvall <danek.duvall@sun.com>
parents: 146
diff changeset
   117
                        if a != b:
30
f06ad6cb4b3f stop using flavour terminology
Stephen Hahn <sch@sun.com>
parents: 26
diff changeset
   118
                                return False
f06ad6cb4b3f stop using flavour terminology
Stephen Hahn <sch@sun.com>
parents: 26
diff changeset
   119
                return True
f06ad6cb4b3f stop using flavour terminology
Stephen Hahn <sch@sun.com>
parents: 26
diff changeset
   120
3
f1296620648e reorganize code into a source directory
"Stephen Hahn <sch@sun.com>"
parents:
diff changeset
   121
        def is_same_major(self, other):
416
bbfe37efa018 2344 fmris could be smaller, faster, better
Dan Price <dp@eng.sun.com>
parents: 409
diff changeset
   122
                """ Test if DotSequences have the same major number """
bbfe37efa018 2344 fmris could be smaller, faster, better
Dan Price <dp@eng.sun.com>
parents: 409
diff changeset
   123
                return self[0] == other[0]
3
f1296620648e reorganize code into a source directory
"Stephen Hahn <sch@sun.com>"
parents:
diff changeset
   124
f1296620648e reorganize code into a source directory
"Stephen Hahn <sch@sun.com>"
parents:
diff changeset
   125
        def is_same_minor(self, other):
416
bbfe37efa018 2344 fmris could be smaller, faster, better
Dan Price <dp@eng.sun.com>
parents: 409
diff changeset
   126
                """ Test if DotSequences have the same major and minor num """
bbfe37efa018 2344 fmris could be smaller, faster, better
Dan Price <dp@eng.sun.com>
parents: 409
diff changeset
   127
                return self[0] == other[0] and self[1] == other[1]
3
f1296620648e reorganize code into a source directory
"Stephen Hahn <sch@sun.com>"
parents:
diff changeset
   128
f1296620648e reorganize code into a source directory
"Stephen Hahn <sch@sun.com>"
parents:
diff changeset
   129
852
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   130
class MatchingDotSequence(DotSequence):
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   131
        """A subclass of DotSequence with (much) weaker rules about its format.
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   132
        This is intended to accept user input with wildcard characters."""
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   133
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   134
        @staticmethod
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   135
        def dotsequence_val(elem):
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   136
                # Do this first; if the string is zero chars or non-numeric
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   137
                # chars (other than "*"), an exception will be raised.
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   138
                if elem == "*":
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   139
                        return elem
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   140
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   141
                return DotSequence.dotsequence_val(elem)
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   142
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   143
        def __init__(self, dotstring):
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   144
                try:
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   145
                        list.__init__(self,
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   146
                            map(self.dotsequence_val,
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   147
                                dotstring.split(".")))
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   148
                except ValueError:
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   149
                        raise IllegalDotSequence(dotstring)
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   150
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   151
                if len(self) == 0:
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   152
                        raise IllegalDotSequence("Empty MatchingDotSequence")
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   153
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   154
        def __ne__(self, other):
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   155
                if not isinstance(other, DotSequence):
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   156
                        return True
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   157
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   158
                ls = len(self)
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   159
                lo = len(other)
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   160
                for i in range(max(ls, lo)):
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   161
                        try:
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   162
                                if self[i] != other[i] and ("*" not in (self[i],
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   163
                                    other[i])):
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   164
                                        return True
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   165
                        except IndexError:
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   166
                                if ls < (i + 1) and "*" not in (self[-1],
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   167
                                    other[i]):
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   168
                                        return True
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   169
                                if lo < (i + 1) and "*" not in (self[i],
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   170
                                    other[-1]):
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   171
                                        return True
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   172
                return False
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   173
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   174
        def __eq__(self, other):
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   175
                if not isinstance(other, DotSequence):
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   176
                        return False
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   177
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   178
                ls = len(self)
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   179
                lo = len(other)
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   180
                for i in range(max(ls, lo)):
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   181
                        try:
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   182
                                if self[i] != other[i] and ("*" not in (self[i],
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   183
                                    other[i])):
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   184
                                        return False
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   185
                        except IndexError:
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   186
                                if ls < (i + 1) and "*" not in (self[-1],
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   187
                                    other[i]):
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   188
                                        return False
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   189
                                if lo < (i + 1) and "*" not in (self[i],
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   190
                                    other[-1]):
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   191
                                        return False
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   192
                return True
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   193
1537
00a5b4d54eb8 5872 List APIs required
Shawn Walker <srw@sun.com>
parents: 1516
diff changeset
   194
        def is_subsequence(self, other):
00a5b4d54eb8 5872 List APIs required
Shawn Walker <srw@sun.com>
parents: 1516
diff changeset
   195
                """Return true if self is a "subsequence" of other, meaning that
00a5b4d54eb8 5872 List APIs required
Shawn Walker <srw@sun.com>
parents: 1516
diff changeset
   196
                other and self have identical components, up to the length of
00a5b4d54eb8 5872 List APIs required
Shawn Walker <srw@sun.com>
parents: 1516
diff changeset
   197
                self's sequence or self or other is '*'."""
00a5b4d54eb8 5872 List APIs required
Shawn Walker <srw@sun.com>
parents: 1516
diff changeset
   198
00a5b4d54eb8 5872 List APIs required
Shawn Walker <srw@sun.com>
parents: 1516
diff changeset
   199
                if str(self) == "*" or str(other) == "*":
00a5b4d54eb8 5872 List APIs required
Shawn Walker <srw@sun.com>
parents: 1516
diff changeset
   200
                        return True
00a5b4d54eb8 5872 List APIs required
Shawn Walker <srw@sun.com>
parents: 1516
diff changeset
   201
00a5b4d54eb8 5872 List APIs required
Shawn Walker <srw@sun.com>
parents: 1516
diff changeset
   202
                if len(self) > len(other):
00a5b4d54eb8 5872 List APIs required
Shawn Walker <srw@sun.com>
parents: 1516
diff changeset
   203
                        return False
00a5b4d54eb8 5872 List APIs required
Shawn Walker <srw@sun.com>
parents: 1516
diff changeset
   204
00a5b4d54eb8 5872 List APIs required
Shawn Walker <srw@sun.com>
parents: 1516
diff changeset
   205
                for a, b in zip(self, other):
00a5b4d54eb8 5872 List APIs required
Shawn Walker <srw@sun.com>
parents: 1516
diff changeset
   206
                        if a != b:
00a5b4d54eb8 5872 List APIs required
Shawn Walker <srw@sun.com>
parents: 1516
diff changeset
   207
                                return False
00a5b4d54eb8 5872 List APIs required
Shawn Walker <srw@sun.com>
parents: 1516
diff changeset
   208
                return True
00a5b4d54eb8 5872 List APIs required
Shawn Walker <srw@sun.com>
parents: 1516
diff changeset
   209
00a5b4d54eb8 5872 List APIs required
Shawn Walker <srw@sun.com>
parents: 1516
diff changeset
   210
        def is_same_major(self, other):
00a5b4d54eb8 5872 List APIs required
Shawn Walker <srw@sun.com>
parents: 1516
diff changeset
   211
                """Test if DotSequences have the same major number, or major
00a5b4d54eb8 5872 List APIs required
Shawn Walker <srw@sun.com>
parents: 1516
diff changeset
   212
                is '*'."""
00a5b4d54eb8 5872 List APIs required
Shawn Walker <srw@sun.com>
parents: 1516
diff changeset
   213
                return self[0] == "*" or other[0] == "*" or self[0] == other[0]
00a5b4d54eb8 5872 List APIs required
Shawn Walker <srw@sun.com>
parents: 1516
diff changeset
   214
00a5b4d54eb8 5872 List APIs required
Shawn Walker <srw@sun.com>
parents: 1516
diff changeset
   215
        def is_same_minor(self, other):
00a5b4d54eb8 5872 List APIs required
Shawn Walker <srw@sun.com>
parents: 1516
diff changeset
   216
                """ Test if DotSequences have the same major and minor num."""
00a5b4d54eb8 5872 List APIs required
Shawn Walker <srw@sun.com>
parents: 1516
diff changeset
   217
                return self[0] == "*" or other[0] == "*" or self[1] == "*" or \
00a5b4d54eb8 5872 List APIs required
Shawn Walker <srw@sun.com>
parents: 1516
diff changeset
   218
                    other[1] == "*" or \
00a5b4d54eb8 5872 List APIs required
Shawn Walker <srw@sun.com>
parents: 1516
diff changeset
   219
                    (self[0] == other[0] and self[1] == other[1])
00a5b4d54eb8 5872 List APIs required
Shawn Walker <srw@sun.com>
parents: 1516
diff changeset
   220
852
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   221
933
601797170f72 3739 pkg.depotd traceback on malformed requests
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 856
diff changeset
   222
class IllegalVersion(VersionError):
601797170f72 3739 pkg.depotd traceback on malformed requests
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 856
diff changeset
   223
        """Used to indicate that the specified version string is not valid."""
852
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   224
3
f1296620648e reorganize code into a source directory
"Stephen Hahn <sch@sun.com>"
parents:
diff changeset
   225
class Version(object):
59
eef94b0c0694 require dependencies; dependency following; pkg status; timestamp change
Stephen Hahn <sch@sun.com>
parents: 45
diff changeset
   226
        """Version format is release[,build_release]-branch:datetime, which we
416
bbfe37efa018 2344 fmris could be smaller, faster, better
Dan Price <dp@eng.sun.com>
parents: 409
diff changeset
   227
        decompose into three DotSequences and a date string.  Time
59
eef94b0c0694 require dependencies; dependency following; pkg status; timestamp change
Stephen Hahn <sch@sun.com>
parents: 45
diff changeset
   228
        representation is in the ISO8601-compliant form "YYYYMMDDTHHMMSSZ",
eef94b0c0694 require dependencies; dependency following; pkg status; timestamp change
Stephen Hahn <sch@sun.com>
parents: 45
diff changeset
   229
        referring to the UTC time associated with the version.  The release and
eef94b0c0694 require dependencies; dependency following; pkg status; timestamp change
Stephen Hahn <sch@sun.com>
parents: 45
diff changeset
   230
        branch DotSequences are interpreted normally, where v1 < v2 implies that
eef94b0c0694 require dependencies; dependency following; pkg status; timestamp change
Stephen Hahn <sch@sun.com>
parents: 45
diff changeset
   231
        v2 is a later release or branch.  The build_release DotSequence records
eef94b0c0694 require dependencies; dependency following; pkg status; timestamp change
Stephen Hahn <sch@sun.com>
parents: 45
diff changeset
   232
        the system on which the package binaries were constructed.
eef94b0c0694 require dependencies; dependency following; pkg status; timestamp change
Stephen Hahn <sch@sun.com>
parents: 45
diff changeset
   233
        Interpretation of the build_release by the client is that, in the case
eef94b0c0694 require dependencies; dependency following; pkg status; timestamp change
Stephen Hahn <sch@sun.com>
parents: 45
diff changeset
   234
        b1 < b2, a b1 package can be run on either b1 or b2 systems,while a b2
eef94b0c0694 require dependencies; dependency following; pkg status; timestamp change
Stephen Hahn <sch@sun.com>
parents: 45
diff changeset
   235
        package can only be run on a b2 system."""
3
f1296620648e reorganize code into a source directory
"Stephen Hahn <sch@sun.com>"
parents:
diff changeset
   236
1698
83aaa0d436d7 11029 Implement Flyweight pattern and __slots__ to reduce fmri memory usage
johansen <johansen@sun.com>
parents: 1537
diff changeset
   237
        __slots__ = ["release", "branch", "build_release", "timestr"]
83aaa0d436d7 11029 Implement Flyweight pattern and __slots__ to reduce fmri memory usage
johansen <johansen@sun.com>
parents: 1537
diff changeset
   238
22
379f0f6809ff pkgsend open, pkgsend add file, pkgsend close; Transaction object
"Stephen Hahn <sch@sun.com>"
parents: 14
diff changeset
   239
        def __init__(self, version_string, build_string):
3
f1296620648e reorganize code into a source directory
"Stephen Hahn <sch@sun.com>"
parents:
diff changeset
   240
                # XXX If illegally formatted, raise exception.
59
eef94b0c0694 require dependencies; dependency following; pkg status; timestamp change
Stephen Hahn <sch@sun.com>
parents: 45
diff changeset
   241
416
bbfe37efa018 2344 fmris could be smaller, faster, better
Dan Price <dp@eng.sun.com>
parents: 409
diff changeset
   242
                if not version_string:
526
8c243883ae41 822 Depot traceback on "pkgsend -s <server> open foo"
Dan Price <dp@eng.sun.com>
parents: 429
diff changeset
   243
                        raise IllegalVersion, "Version cannot be empty"
416
bbfe37efa018 2344 fmris could be smaller, faster, better
Dan Price <dp@eng.sun.com>
parents: 409
diff changeset
   244
526
8c243883ae41 822 Depot traceback on "pkgsend -s <server> open foo"
Dan Price <dp@eng.sun.com>
parents: 429
diff changeset
   245
                #
8c243883ae41 822 Depot traceback on "pkgsend -s <server> open foo"
Dan Price <dp@eng.sun.com>
parents: 429
diff changeset
   246
                # Locate and extract the time, branch, and build strings,
8c243883ae41 822 Depot traceback on "pkgsend -s <server> open foo"
Dan Price <dp@eng.sun.com>
parents: 429
diff changeset
   247
                # if specified.  Error checking happens in the second half of
8c243883ae41 822 Depot traceback on "pkgsend -s <server> open foo"
Dan Price <dp@eng.sun.com>
parents: 429
diff changeset
   248
                # the routine.  In the event that a given part of the input is
8c243883ae41 822 Depot traceback on "pkgsend -s <server> open foo"
Dan Price <dp@eng.sun.com>
parents: 429
diff changeset
   249
                # signalled but empty (for example: '0.3-' or '0.3-3.0:',
8c243883ae41 822 Depot traceback on "pkgsend -s <server> open foo"
Dan Price <dp@eng.sun.com>
parents: 429
diff changeset
   250
                # we'll produce an empty (but not None) string for that portion.
8c243883ae41 822 Depot traceback on "pkgsend -s <server> open foo"
Dan Price <dp@eng.sun.com>
parents: 429
diff changeset
   251
                #
8c243883ae41 822 Depot traceback on "pkgsend -s <server> open foo"
Dan Price <dp@eng.sun.com>
parents: 429
diff changeset
   252
8c243883ae41 822 Depot traceback on "pkgsend -s <server> open foo"
Dan Price <dp@eng.sun.com>
parents: 429
diff changeset
   253
                # Locate and extract the time string, if specified.
416
bbfe37efa018 2344 fmris could be smaller, faster, better
Dan Price <dp@eng.sun.com>
parents: 409
diff changeset
   254
                timeidx = version_string.find(":")
bbfe37efa018 2344 fmris could be smaller, faster, better
Dan Price <dp@eng.sun.com>
parents: 409
diff changeset
   255
                if timeidx != -1:
146
9b9fcd56b8b2 Reduce use of the re module, for performance.
Danek Duvall <danek.duvall@sun.com>
parents: 122
diff changeset
   256
                        timestr = version_string[timeidx + 1:]
416
bbfe37efa018 2344 fmris could be smaller, faster, better
Dan Price <dp@eng.sun.com>
parents: 409
diff changeset
   257
                else:
146
9b9fcd56b8b2 Reduce use of the re module, for performance.
Danek Duvall <danek.duvall@sun.com>
parents: 122
diff changeset
   258
                        timeidx = None
9b9fcd56b8b2 Reduce use of the re module, for performance.
Danek Duvall <danek.duvall@sun.com>
parents: 122
diff changeset
   259
                        timestr = None
59
eef94b0c0694 require dependencies; dependency following; pkg status; timestamp change
Stephen Hahn <sch@sun.com>
parents: 45
diff changeset
   260
526
8c243883ae41 822 Depot traceback on "pkgsend -s <server> open foo"
Dan Price <dp@eng.sun.com>
parents: 429
diff changeset
   261
                # Locate and extract the branch string, if specified.
416
bbfe37efa018 2344 fmris could be smaller, faster, better
Dan Price <dp@eng.sun.com>
parents: 409
diff changeset
   262
                branchidx = version_string.find("-")
bbfe37efa018 2344 fmris could be smaller, faster, better
Dan Price <dp@eng.sun.com>
parents: 409
diff changeset
   263
                if branchidx != -1:
146
9b9fcd56b8b2 Reduce use of the re module, for performance.
Danek Duvall <danek.duvall@sun.com>
parents: 122
diff changeset
   264
                        branch = version_string[branchidx + 1:timeidx]
416
bbfe37efa018 2344 fmris could be smaller, faster, better
Dan Price <dp@eng.sun.com>
parents: 409
diff changeset
   265
                else:
146
9b9fcd56b8b2 Reduce use of the re module, for performance.
Danek Duvall <danek.duvall@sun.com>
parents: 122
diff changeset
   266
                        branchidx = timeidx
9b9fcd56b8b2 Reduce use of the re module, for performance.
Danek Duvall <danek.duvall@sun.com>
parents: 122
diff changeset
   267
                        branch = None
45
8a3f00dea14f catalog refresh; basic catalog listing; precise manifest pulls
Stephen Hahn <sch@sun.com>
parents: 36
diff changeset
   268
526
8c243883ae41 822 Depot traceback on "pkgsend -s <server> open foo"
Dan Price <dp@eng.sun.com>
parents: 429
diff changeset
   269
                # Locate and extract the build string, if specified.
416
bbfe37efa018 2344 fmris could be smaller, faster, better
Dan Price <dp@eng.sun.com>
parents: 409
diff changeset
   270
                buildidx = version_string.find(",")
bbfe37efa018 2344 fmris could be smaller, faster, better
Dan Price <dp@eng.sun.com>
parents: 409
diff changeset
   271
                if buildidx != -1:
146
9b9fcd56b8b2 Reduce use of the re module, for performance.
Danek Duvall <danek.duvall@sun.com>
parents: 122
diff changeset
   272
                        build = version_string[buildidx + 1:branchidx]
416
bbfe37efa018 2344 fmris could be smaller, faster, better
Dan Price <dp@eng.sun.com>
parents: 409
diff changeset
   273
                else:
146
9b9fcd56b8b2 Reduce use of the re module, for performance.
Danek Duvall <danek.duvall@sun.com>
parents: 122
diff changeset
   274
                        buildidx = branchidx
9b9fcd56b8b2 Reduce use of the re module, for performance.
Danek Duvall <danek.duvall@sun.com>
parents: 122
diff changeset
   275
                        build = None
45
8a3f00dea14f catalog refresh; basic catalog listing; precise manifest pulls
Stephen Hahn <sch@sun.com>
parents: 36
diff changeset
   276
175
8d591677690b 22 Specifying a version on the "pkg install" commandline makes no difference
Danek Duvall <danek.duvall@sun.com>
parents: 146
diff changeset
   277
                if buildidx == 0:
8d591677690b 22 Specifying a version on the "pkg install" commandline makes no difference
Danek Duvall <danek.duvall@sun.com>
parents: 146
diff changeset
   278
                        raise IllegalVersion, \
526
8c243883ae41 822 Depot traceback on "pkgsend -s <server> open foo"
Dan Price <dp@eng.sun.com>
parents: 429
diff changeset
   279
                            "Versions must have a release value"
175
8d591677690b 22 Specifying a version on the "pkg install" commandline makes no difference
Danek Duvall <danek.duvall@sun.com>
parents: 146
diff changeset
   280
526
8c243883ae41 822 Depot traceback on "pkgsend -s <server> open foo"
Dan Price <dp@eng.sun.com>
parents: 429
diff changeset
   281
                #
8c243883ae41 822 Depot traceback on "pkgsend -s <server> open foo"
Dan Price <dp@eng.sun.com>
parents: 429
diff changeset
   282
                # Error checking and conversion from strings to objects
8c243883ae41 822 Depot traceback on "pkgsend -s <server> open foo"
Dan Price <dp@eng.sun.com>
parents: 429
diff changeset
   283
                # begins here.
8c243883ae41 822 Depot traceback on "pkgsend -s <server> open foo"
Dan Price <dp@eng.sun.com>
parents: 429
diff changeset
   284
                #
565
1fb4f05220b9 3443 An api needs to be provided for safe interaction of front-ends
Brock Pytlik <bpytlik@sun.com>
parents: 526
diff changeset
   285
                try:
1fb4f05220b9 3443 An api needs to be provided for safe interaction of front-ends
Brock Pytlik <bpytlik@sun.com>
parents: 526
diff changeset
   286
                        self.release = DotSequence(version_string[:buildidx])
146
9b9fcd56b8b2 Reduce use of the re module, for performance.
Danek Duvall <danek.duvall@sun.com>
parents: 122
diff changeset
   287
565
1fb4f05220b9 3443 An api needs to be provided for safe interaction of front-ends
Brock Pytlik <bpytlik@sun.com>
parents: 526
diff changeset
   288
                        if branch is not None:
1fb4f05220b9 3443 An api needs to be provided for safe interaction of front-ends
Brock Pytlik <bpytlik@sun.com>
parents: 526
diff changeset
   289
                                self.branch = DotSequence(branch)
1fb4f05220b9 3443 An api needs to be provided for safe interaction of front-ends
Brock Pytlik <bpytlik@sun.com>
parents: 526
diff changeset
   290
                        else:
1fb4f05220b9 3443 An api needs to be provided for safe interaction of front-ends
Brock Pytlik <bpytlik@sun.com>
parents: 526
diff changeset
   291
                                self.branch = None
22
379f0f6809ff pkgsend open, pkgsend add file, pkgsend close; Transaction object
"Stephen Hahn <sch@sun.com>"
parents: 14
diff changeset
   292
565
1fb4f05220b9 3443 An api needs to be provided for safe interaction of front-ends
Brock Pytlik <bpytlik@sun.com>
parents: 526
diff changeset
   293
                        if build is not None:
1fb4f05220b9 3443 An api needs to be provided for safe interaction of front-ends
Brock Pytlik <bpytlik@sun.com>
parents: 526
diff changeset
   294
                                self.build_release = DotSequence(build)
1fb4f05220b9 3443 An api needs to be provided for safe interaction of front-ends
Brock Pytlik <bpytlik@sun.com>
parents: 526
diff changeset
   295
                        else:
856
9996b177649c 6332 Version shouldn't have assertions in initializer
johansen <johansen@sun.com>
parents: 852
diff changeset
   296
                                if build_string is None:
9996b177649c 6332 Version shouldn't have assertions in initializer
johansen <johansen@sun.com>
parents: 852
diff changeset
   297
                                        raise IllegalVersion("No build version "
9996b177649c 6332 Version shouldn't have assertions in initializer
johansen <johansen@sun.com>
parents: 852
diff changeset
   298
                                            "provided in Version constructor: "
9996b177649c 6332 Version shouldn't have assertions in initializer
johansen <johansen@sun.com>
parents: 852
diff changeset
   299
                                            "(%s, %s)" % (version_string,
9996b177649c 6332 Version shouldn't have assertions in initializer
johansen <johansen@sun.com>
parents: 852
diff changeset
   300
                                            build_string))
565
1fb4f05220b9 3443 An api needs to be provided for safe interaction of front-ends
Brock Pytlik <bpytlik@sun.com>
parents: 526
diff changeset
   301
                                self.build_release = DotSequence(build_string)
526
8c243883ae41 822 Depot traceback on "pkgsend -s <server> open foo"
Dan Price <dp@eng.sun.com>
parents: 429
diff changeset
   302
933
601797170f72 3739 pkg.depotd traceback on malformed requests
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 856
diff changeset
   303
                except IllegalDotSequence, e:
601797170f72 3739 pkg.depotd traceback on malformed requests
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 856
diff changeset
   304
                        raise IllegalVersion("Bad Version: %s" % e)
59
eef94b0c0694 require dependencies; dependency following; pkg status; timestamp change
Stephen Hahn <sch@sun.com>
parents: 45
diff changeset
   305
416
bbfe37efa018 2344 fmris could be smaller, faster, better
Dan Price <dp@eng.sun.com>
parents: 409
diff changeset
   306
                #
bbfe37efa018 2344 fmris could be smaller, faster, better
Dan Price <dp@eng.sun.com>
parents: 409
diff changeset
   307
                # In 99% of the cases in which we use date and time, it's solely
bbfe37efa018 2344 fmris could be smaller, faster, better
Dan Price <dp@eng.sun.com>
parents: 409
diff changeset
   308
                # for comparison.  Since the ISO date string lexicographically
bbfe37efa018 2344 fmris could be smaller, faster, better
Dan Price <dp@eng.sun.com>
parents: 409
diff changeset
   309
                # collates in date order, we just hold onto the string-
bbfe37efa018 2344 fmris could be smaller, faster, better
Dan Price <dp@eng.sun.com>
parents: 409
diff changeset
   310
                # converting it to anything else is expensive.
bbfe37efa018 2344 fmris could be smaller, faster, better
Dan Price <dp@eng.sun.com>
parents: 409
diff changeset
   311
                #
526
8c243883ae41 822 Depot traceback on "pkgsend -s <server> open foo"
Dan Price <dp@eng.sun.com>
parents: 429
diff changeset
   312
                if timestr is not None:
416
bbfe37efa018 2344 fmris could be smaller, faster, better
Dan Price <dp@eng.sun.com>
parents: 409
diff changeset
   313
                        if len(timestr) != 16 or timestr[8] != "T" \
bbfe37efa018 2344 fmris could be smaller, faster, better
Dan Price <dp@eng.sun.com>
parents: 409
diff changeset
   314
                            or timestr[15] != "Z":
bbfe37efa018 2344 fmris could be smaller, faster, better
Dan Price <dp@eng.sun.com>
parents: 409
diff changeset
   315
                                raise IllegalVersion, \
bbfe37efa018 2344 fmris could be smaller, faster, better
Dan Price <dp@eng.sun.com>
parents: 409
diff changeset
   316
                                    "Time must be ISO8601 format."
bbfe37efa018 2344 fmris could be smaller, faster, better
Dan Price <dp@eng.sun.com>
parents: 409
diff changeset
   317
                        try:
bbfe37efa018 2344 fmris could be smaller, faster, better
Dan Price <dp@eng.sun.com>
parents: 409
diff changeset
   318
                                dateint = int(timestr[0:8])
bbfe37efa018 2344 fmris could be smaller, faster, better
Dan Price <dp@eng.sun.com>
parents: 409
diff changeset
   319
                                timeint = int(timestr[9:15])
bbfe37efa018 2344 fmris could be smaller, faster, better
Dan Price <dp@eng.sun.com>
parents: 409
diff changeset
   320
                                datetime.datetime(dateint / 10000,
bbfe37efa018 2344 fmris could be smaller, faster, better
Dan Price <dp@eng.sun.com>
parents: 409
diff changeset
   321
                                    (dateint / 100) % 100,
bbfe37efa018 2344 fmris could be smaller, faster, better
Dan Price <dp@eng.sun.com>
parents: 409
diff changeset
   322
                                    dateint % 100,
bbfe37efa018 2344 fmris could be smaller, faster, better
Dan Price <dp@eng.sun.com>
parents: 409
diff changeset
   323
                                    timeint / 10000,
bbfe37efa018 2344 fmris could be smaller, faster, better
Dan Price <dp@eng.sun.com>
parents: 409
diff changeset
   324
                                    (timeint / 100) % 100,
bbfe37efa018 2344 fmris could be smaller, faster, better
Dan Price <dp@eng.sun.com>
parents: 409
diff changeset
   325
                                    timeint % 100)
576
6ee6de304041 3777 PKG_TIMEOUT_MAX is a placebo setting
Dan Price <dp@eng.sun.com>
parents: 565
diff changeset
   326
                        except ValueError:
416
bbfe37efa018 2344 fmris could be smaller, faster, better
Dan Price <dp@eng.sun.com>
parents: 409
diff changeset
   327
                                raise IllegalVersion, \
bbfe37efa018 2344 fmris could be smaller, faster, better
Dan Price <dp@eng.sun.com>
parents: 409
diff changeset
   328
                                    "Time must be ISO8601 format."
bbfe37efa018 2344 fmris could be smaller, faster, better
Dan Price <dp@eng.sun.com>
parents: 409
diff changeset
   329
bbfe37efa018 2344 fmris could be smaller, faster, better
Dan Price <dp@eng.sun.com>
parents: 409
diff changeset
   330
                        self.timestr = timestr
146
9b9fcd56b8b2 Reduce use of the re module, for performance.
Danek Duvall <danek.duvall@sun.com>
parents: 122
diff changeset
   331
                else:
416
bbfe37efa018 2344 fmris could be smaller, faster, better
Dan Price <dp@eng.sun.com>
parents: 409
diff changeset
   332
                        self.timestr = None
3
f1296620648e reorganize code into a source directory
"Stephen Hahn <sch@sun.com>"
parents:
diff changeset
   333
22
379f0f6809ff pkgsend open, pkgsend add file, pkgsend close; Transaction object
"Stephen Hahn <sch@sun.com>"
parents: 14
diff changeset
   334
        def compatible_with_build(self, target):
379f0f6809ff pkgsend open, pkgsend add file, pkgsend close; Transaction object
"Stephen Hahn <sch@sun.com>"
parents: 14
diff changeset
   335
                """target is a DotSequence for the target system."""
379f0f6809ff pkgsend open, pkgsend add file, pkgsend close; Transaction object
"Stephen Hahn <sch@sun.com>"
parents: 14
diff changeset
   336
                if self.build_release < target:
379f0f6809ff pkgsend open, pkgsend add file, pkgsend close; Transaction object
"Stephen Hahn <sch@sun.com>"
parents: 14
diff changeset
   337
                        return True
379f0f6809ff pkgsend open, pkgsend add file, pkgsend close; Transaction object
"Stephen Hahn <sch@sun.com>"
parents: 14
diff changeset
   338
                return False
379f0f6809ff pkgsend open, pkgsend add file, pkgsend close; Transaction object
"Stephen Hahn <sch@sun.com>"
parents: 14
diff changeset
   339
3
f1296620648e reorganize code into a source directory
"Stephen Hahn <sch@sun.com>"
parents:
diff changeset
   340
        def __str__(self):
416
bbfe37efa018 2344 fmris could be smaller, faster, better
Dan Price <dp@eng.sun.com>
parents: 409
diff changeset
   341
                outstr = str(self.release) + "," + str(self.build_release)
175
8d591677690b 22 Specifying a version on the "pkg install" commandline makes no difference
Danek Duvall <danek.duvall@sun.com>
parents: 146
diff changeset
   342
                if self.branch:
416
bbfe37efa018 2344 fmris could be smaller, faster, better
Dan Price <dp@eng.sun.com>
parents: 409
diff changeset
   343
                        outstr += "-" + str(self.branch)
bbfe37efa018 2344 fmris could be smaller, faster, better
Dan Price <dp@eng.sun.com>
parents: 409
diff changeset
   344
                if self.timestr:
bbfe37efa018 2344 fmris could be smaller, faster, better
Dan Price <dp@eng.sun.com>
parents: 409
diff changeset
   345
                        outstr += ":" + self.timestr
bbfe37efa018 2344 fmris could be smaller, faster, better
Dan Price <dp@eng.sun.com>
parents: 409
diff changeset
   346
                return outstr
3
f1296620648e reorganize code into a source directory
"Stephen Hahn <sch@sun.com>"
parents:
diff changeset
   347
419
a38f1ed7cf76 1867 'pkg list' takes *WAY* too long
Danek Duvall <danek.duvall@sun.com>
parents: 416
diff changeset
   348
        def __repr__(self):
a38f1ed7cf76 1867 'pkg list' takes *WAY* too long
Danek Duvall <danek.duvall@sun.com>
parents: 416
diff changeset
   349
                return "<pkg.fmri.Version '%s' at %#x>" % (self, id(self))
a38f1ed7cf76 1867 'pkg list' takes *WAY* too long
Danek Duvall <danek.duvall@sun.com>
parents: 416
diff changeset
   350
23
51b8b48fea32 begin server source reorganization
"Stephen Hahn <sch@sun.com>"
parents: 22
diff changeset
   351
        def get_short_version(self):
175
8d591677690b 22 Specifying a version on the "pkg install" commandline makes no difference
Danek Duvall <danek.duvall@sun.com>
parents: 146
diff changeset
   352
                branch_str = ""
852
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   353
                if self.branch is not None:
175
8d591677690b 22 Specifying a version on the "pkg install" commandline makes no difference
Danek Duvall <danek.duvall@sun.com>
parents: 146
diff changeset
   354
                        branch_str = "-%s" % self.branch
8d591677690b 22 Specifying a version on the "pkg install" commandline makes no difference
Danek Duvall <danek.duvall@sun.com>
parents: 146
diff changeset
   355
                return "%s%s" % (self.release, branch_str)
23
51b8b48fea32 begin server source reorganization
"Stephen Hahn <sch@sun.com>"
parents: 22
diff changeset
   356
416
bbfe37efa018 2344 fmris could be smaller, faster, better
Dan Price <dp@eng.sun.com>
parents: 409
diff changeset
   357
        def set_timestamp(self, timestamp=datetime.datetime.utcnow()):
bbfe37efa018 2344 fmris could be smaller, faster, better
Dan Price <dp@eng.sun.com>
parents: 409
diff changeset
   358
                assert type(timestamp) == datetime.datetime
bbfe37efa018 2344 fmris could be smaller, faster, better
Dan Price <dp@eng.sun.com>
parents: 409
diff changeset
   359
                assert timestamp.tzname() == None or timestamp.tzname() == "UTC"
bbfe37efa018 2344 fmris could be smaller, faster, better
Dan Price <dp@eng.sun.com>
parents: 409
diff changeset
   360
                self.timestr = timestamp.strftime("%Y%m%dT%H%M%SZ")
32
c26788b7217c begin client install; sequences are now timestamps; skeleton ELF module
Stephen Hahn <sch@sun.com>
parents: 30
diff changeset
   361
313
c4d18a029dfd 761 'import timedanek' in subprocess_method.py's __main__
Danek Duvall <danek.duvall@sun.com>
parents: 268
diff changeset
   362
        def get_timestamp(self):
416
bbfe37efa018 2344 fmris could be smaller, faster, better
Dan Price <dp@eng.sun.com>
parents: 409
diff changeset
   363
                if not self.timestr:
bbfe37efa018 2344 fmris could be smaller, faster, better
Dan Price <dp@eng.sun.com>
parents: 409
diff changeset
   364
                        return None
bbfe37efa018 2344 fmris could be smaller, faster, better
Dan Price <dp@eng.sun.com>
parents: 409
diff changeset
   365
                t = time.strptime(self.timestr, "%Y%m%dT%H%M%SZ")
bbfe37efa018 2344 fmris could be smaller, faster, better
Dan Price <dp@eng.sun.com>
parents: 409
diff changeset
   366
                return datetime.datetime.utcfromtimestamp(calendar.timegm(t))
32
c26788b7217c begin client install; sequences are now timestamps; skeleton ELF module
Stephen Hahn <sch@sun.com>
parents: 30
diff changeset
   367
3
f1296620648e reorganize code into a source directory
"Stephen Hahn <sch@sun.com>"
parents:
diff changeset
   368
        def __ne__(self, other):
852
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   369
                if not isinstance(other, Version):
22
379f0f6809ff pkgsend open, pkgsend add file, pkgsend close; Transaction object
"Stephen Hahn <sch@sun.com>"
parents: 14
diff changeset
   370
                        return True
379f0f6809ff pkgsend open, pkgsend add file, pkgsend close; Transaction object
"Stephen Hahn <sch@sun.com>"
parents: 14
diff changeset
   371
3
f1296620648e reorganize code into a source directory
"Stephen Hahn <sch@sun.com>"
parents:
diff changeset
   372
                if self.release == other.release and \
f1296620648e reorganize code into a source directory
"Stephen Hahn <sch@sun.com>"
parents:
diff changeset
   373
                    self.branch == other.branch and \
416
bbfe37efa018 2344 fmris could be smaller, faster, better
Dan Price <dp@eng.sun.com>
parents: 409
diff changeset
   374
                    self.timestr == other.timestr:
3
f1296620648e reorganize code into a source directory
"Stephen Hahn <sch@sun.com>"
parents:
diff changeset
   375
                        return False
f1296620648e reorganize code into a source directory
"Stephen Hahn <sch@sun.com>"
parents:
diff changeset
   376
                return True
f1296620648e reorganize code into a source directory
"Stephen Hahn <sch@sun.com>"
parents:
diff changeset
   377
f1296620648e reorganize code into a source directory
"Stephen Hahn <sch@sun.com>"
parents:
diff changeset
   378
        def __eq__(self, other):
852
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   379
                if not isinstance(other, Version):
22
379f0f6809ff pkgsend open, pkgsend add file, pkgsend close; Transaction object
"Stephen Hahn <sch@sun.com>"
parents: 14
diff changeset
   380
                        return False
379f0f6809ff pkgsend open, pkgsend add file, pkgsend close; Transaction object
"Stephen Hahn <sch@sun.com>"
parents: 14
diff changeset
   381
3
f1296620648e reorganize code into a source directory
"Stephen Hahn <sch@sun.com>"
parents:
diff changeset
   382
                if self.release == other.release and \
f1296620648e reorganize code into a source directory
"Stephen Hahn <sch@sun.com>"
parents:
diff changeset
   383
                    self.branch == other.branch and \
416
bbfe37efa018 2344 fmris could be smaller, faster, better
Dan Price <dp@eng.sun.com>
parents: 409
diff changeset
   384
                    self.timestr == other.timestr:
3
f1296620648e reorganize code into a source directory
"Stephen Hahn <sch@sun.com>"
parents:
diff changeset
   385
                        return True
f1296620648e reorganize code into a source directory
"Stephen Hahn <sch@sun.com>"
parents:
diff changeset
   386
                return False
f1296620648e reorganize code into a source directory
"Stephen Hahn <sch@sun.com>"
parents:
diff changeset
   387
f1296620648e reorganize code into a source directory
"Stephen Hahn <sch@sun.com>"
parents:
diff changeset
   388
        def __lt__(self, other):
175
8d591677690b 22 Specifying a version on the "pkg install" commandline makes no difference
Danek Duvall <danek.duvall@sun.com>
parents: 146
diff changeset
   389
                """Returns True if 'self' comes before 'other', and vice versa.
8d591677690b 22 Specifying a version on the "pkg install" commandline makes no difference
Danek Duvall <danek.duvall@sun.com>
parents: 146
diff changeset
   390
8d591677690b 22 Specifying a version on the "pkg install" commandline makes no difference
Danek Duvall <danek.duvall@sun.com>
parents: 146
diff changeset
   391
                If exactly one of the release values of the versions is None,
8d591677690b 22 Specifying a version on the "pkg install" commandline makes no difference
Danek Duvall <danek.duvall@sun.com>
parents: 146
diff changeset
   392
                then that version is less than the other.  The same applies to
8d591677690b 22 Specifying a version on the "pkg install" commandline makes no difference
Danek Duvall <danek.duvall@sun.com>
parents: 146
diff changeset
   393
                the branch and timestamp components.
8d591677690b 22 Specifying a version on the "pkg install" commandline makes no difference
Danek Duvall <danek.duvall@sun.com>
parents: 146
diff changeset
   394
                """
852
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   395
                if not isinstance(other, Version):
258
b3b7592412ec 270 Need ability to rename packages
johansen <johansen@sun.com>
parents: 181
diff changeset
   396
                        return False
b3b7592412ec 270 Need ability to rename packages
johansen <johansen@sun.com>
parents: 181
diff changeset
   397
416
bbfe37efa018 2344 fmris could be smaller, faster, better
Dan Price <dp@eng.sun.com>
parents: 409
diff changeset
   398
                if self.release < other.release:
bbfe37efa018 2344 fmris could be smaller, faster, better
Dan Price <dp@eng.sun.com>
parents: 409
diff changeset
   399
                        return True
bbfe37efa018 2344 fmris could be smaller, faster, better
Dan Price <dp@eng.sun.com>
parents: 409
diff changeset
   400
                if self.release != other.release:
3
f1296620648e reorganize code into a source directory
"Stephen Hahn <sch@sun.com>"
parents:
diff changeset
   401
                        return False
175
8d591677690b 22 Specifying a version on the "pkg install" commandline makes no difference
Danek Duvall <danek.duvall@sun.com>
parents: 146
diff changeset
   402
416
bbfe37efa018 2344 fmris could be smaller, faster, better
Dan Price <dp@eng.sun.com>
parents: 409
diff changeset
   403
                if self.branch < other.branch:
bbfe37efa018 2344 fmris could be smaller, faster, better
Dan Price <dp@eng.sun.com>
parents: 409
diff changeset
   404
                        return True
bbfe37efa018 2344 fmris could be smaller, faster, better
Dan Price <dp@eng.sun.com>
parents: 409
diff changeset
   405
                if self.branch != other.branch:
3
f1296620648e reorganize code into a source directory
"Stephen Hahn <sch@sun.com>"
parents:
diff changeset
   406
                        return False
175
8d591677690b 22 Specifying a version on the "pkg install" commandline makes no difference
Danek Duvall <danek.duvall@sun.com>
parents: 146
diff changeset
   407
416
bbfe37efa018 2344 fmris could be smaller, faster, better
Dan Price <dp@eng.sun.com>
parents: 409
diff changeset
   408
                return self.timestr < other.timestr
3
f1296620648e reorganize code into a source directory
"Stephen Hahn <sch@sun.com>"
parents:
diff changeset
   409
f1296620648e reorganize code into a source directory
"Stephen Hahn <sch@sun.com>"
parents:
diff changeset
   410
        def __gt__(self, other):
175
8d591677690b 22 Specifying a version on the "pkg install" commandline makes no difference
Danek Duvall <danek.duvall@sun.com>
parents: 146
diff changeset
   411
                """Returns True if 'self' comes after 'other', and vice versa.
8d591677690b 22 Specifying a version on the "pkg install" commandline makes no difference
Danek Duvall <danek.duvall@sun.com>
parents: 146
diff changeset
   412
8d591677690b 22 Specifying a version on the "pkg install" commandline makes no difference
Danek Duvall <danek.duvall@sun.com>
parents: 146
diff changeset
   413
                If exactly one of the release values of the versions is None,
8d591677690b 22 Specifying a version on the "pkg install" commandline makes no difference
Danek Duvall <danek.duvall@sun.com>
parents: 146
diff changeset
   414
                then that version is less than the other.  The same applies to
8d591677690b 22 Specifying a version on the "pkg install" commandline makes no difference
Danek Duvall <danek.duvall@sun.com>
parents: 146
diff changeset
   415
                the branch and timestamp components.
8d591677690b 22 Specifying a version on the "pkg install" commandline makes no difference
Danek Duvall <danek.duvall@sun.com>
parents: 146
diff changeset
   416
                """
852
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   417
                if not isinstance(other, Version):
416
bbfe37efa018 2344 fmris could be smaller, faster, better
Dan Price <dp@eng.sun.com>
parents: 409
diff changeset
   418
                        return True
258
b3b7592412ec 270 Need ability to rename packages
johansen <johansen@sun.com>
parents: 181
diff changeset
   419
416
bbfe37efa018 2344 fmris could be smaller, faster, better
Dan Price <dp@eng.sun.com>
parents: 409
diff changeset
   420
                if self.release > other.release:
3
f1296620648e reorganize code into a source directory
"Stephen Hahn <sch@sun.com>"
parents:
diff changeset
   421
                        return True
416
bbfe37efa018 2344 fmris could be smaller, faster, better
Dan Price <dp@eng.sun.com>
parents: 409
diff changeset
   422
                if self.release != other.release:
3
f1296620648e reorganize code into a source directory
"Stephen Hahn <sch@sun.com>"
parents:
diff changeset
   423
                        return False
175
8d591677690b 22 Specifying a version on the "pkg install" commandline makes no difference
Danek Duvall <danek.duvall@sun.com>
parents: 146
diff changeset
   424
416
bbfe37efa018 2344 fmris could be smaller, faster, better
Dan Price <dp@eng.sun.com>
parents: 409
diff changeset
   425
                if self.branch > other.branch:
3
f1296620648e reorganize code into a source directory
"Stephen Hahn <sch@sun.com>"
parents:
diff changeset
   426
                        return True
416
bbfe37efa018 2344 fmris could be smaller, faster, better
Dan Price <dp@eng.sun.com>
parents: 409
diff changeset
   427
                if self.branch != other.branch:
3
f1296620648e reorganize code into a source directory
"Stephen Hahn <sch@sun.com>"
parents:
diff changeset
   428
                        return False
175
8d591677690b 22 Specifying a version on the "pkg install" commandline makes no difference
Danek Duvall <danek.duvall@sun.com>
parents: 146
diff changeset
   429
416
bbfe37efa018 2344 fmris could be smaller, faster, better
Dan Price <dp@eng.sun.com>
parents: 409
diff changeset
   430
                return self.timestr > other.timestr
3
f1296620648e reorganize code into a source directory
"Stephen Hahn <sch@sun.com>"
parents:
diff changeset
   431
24
35e47f6291fe completed transaction creates server-side package version
"Stephen Hahn <sch@sun.com>"
parents: 23
diff changeset
   432
        def __cmp__(self, other):
35e47f6291fe completed transaction creates server-side package version
"Stephen Hahn <sch@sun.com>"
parents: 23
diff changeset
   433
                if self < other:
35e47f6291fe completed transaction creates server-side package version
"Stephen Hahn <sch@sun.com>"
parents: 23
diff changeset
   434
                        return -1
35e47f6291fe completed transaction creates server-side package version
"Stephen Hahn <sch@sun.com>"
parents: 23
diff changeset
   435
                if self > other:
35e47f6291fe completed transaction creates server-side package version
"Stephen Hahn <sch@sun.com>"
parents: 23
diff changeset
   436
                        return 1
416
bbfe37efa018 2344 fmris could be smaller, faster, better
Dan Price <dp@eng.sun.com>
parents: 409
diff changeset
   437
24
35e47f6291fe completed transaction creates server-side package version
"Stephen Hahn <sch@sun.com>"
parents: 23
diff changeset
   438
                if self.build_release < other.build_release:
35e47f6291fe completed transaction creates server-side package version
"Stephen Hahn <sch@sun.com>"
parents: 23
diff changeset
   439
                        return -1
35e47f6291fe completed transaction creates server-side package version
"Stephen Hahn <sch@sun.com>"
parents: 23
diff changeset
   440
                if self.build_release > other.build_release:
35e47f6291fe completed transaction creates server-side package version
"Stephen Hahn <sch@sun.com>"
parents: 23
diff changeset
   441
                        return 1
35e47f6291fe completed transaction creates server-side package version
"Stephen Hahn <sch@sun.com>"
parents: 23
diff changeset
   442
                return 0
35e47f6291fe completed transaction creates server-side package version
"Stephen Hahn <sch@sun.com>"
parents: 23
diff changeset
   443
429
6c9cbb6e6600 983 pkg search returns just one action per package/token-type combo
Brock Pytlik <bpytlik@sun.com>
parents: 419
diff changeset
   444
        def __hash__(self):
526
8c243883ae41 822 Depot traceback on "pkgsend -s <server> open foo"
Dan Price <dp@eng.sun.com>
parents: 429
diff changeset
   445
                # If a timestamp is present, it's enough to hash on, and is
8c243883ae41 822 Depot traceback on "pkgsend -s <server> open foo"
Dan Price <dp@eng.sun.com>
parents: 429
diff changeset
   446
                # nicely unique.  If not, use release and branch, which are
8c243883ae41 822 Depot traceback on "pkgsend -s <server> open foo"
Dan Price <dp@eng.sun.com>
parents: 429
diff changeset
   447
                # not very unique.
8c243883ae41 822 Depot traceback on "pkgsend -s <server> open foo"
Dan Price <dp@eng.sun.com>
parents: 429
diff changeset
   448
                if self.timestr:
8c243883ae41 822 Depot traceback on "pkgsend -s <server> open foo"
Dan Price <dp@eng.sun.com>
parents: 429
diff changeset
   449
                        return hash(self.timestr)
8c243883ae41 822 Depot traceback on "pkgsend -s <server> open foo"
Dan Price <dp@eng.sun.com>
parents: 429
diff changeset
   450
                else:
8c243883ae41 822 Depot traceback on "pkgsend -s <server> open foo"
Dan Price <dp@eng.sun.com>
parents: 429
diff changeset
   451
                        return hash((self.release, self.branch))
429
6c9cbb6e6600 983 pkg search returns just one action per package/token-type combo
Brock Pytlik <bpytlik@sun.com>
parents: 419
diff changeset
   452
30
f06ad6cb4b3f stop using flavour terminology
Stephen Hahn <sch@sun.com>
parents: 26
diff changeset
   453
        def is_successor(self, other, constraint):
f06ad6cb4b3f stop using flavour terminology
Stephen Hahn <sch@sun.com>
parents: 26
diff changeset
   454
                """Evaluate true if self is a successor version to other.
f06ad6cb4b3f stop using flavour terminology
Stephen Hahn <sch@sun.com>
parents: 26
diff changeset
   455
f06ad6cb4b3f stop using flavour terminology
Stephen Hahn <sch@sun.com>
parents: 26
diff changeset
   456
                The loosest constraint is CONSTRAINT_NONE (None is treated
f06ad6cb4b3f stop using flavour terminology
Stephen Hahn <sch@sun.com>
parents: 26
diff changeset
   457
                equivalently, which is a simple test for self > other.  As we
f06ad6cb4b3f stop using flavour terminology
Stephen Hahn <sch@sun.com>
parents: 26
diff changeset
   458
                proceed through the policies we get stricter, depending on the
f06ad6cb4b3f stop using flavour terminology
Stephen Hahn <sch@sun.com>
parents: 26
diff changeset
   459
                selected constraint.
f06ad6cb4b3f stop using flavour terminology
Stephen Hahn <sch@sun.com>
parents: 26
diff changeset
   460
175
8d591677690b 22 Specifying a version on the "pkg install" commandline makes no difference
Danek Duvall <danek.duvall@sun.com>
parents: 146
diff changeset
   461
                Slightly less loose is CONSTRAINT_AUTO.  In this case, if any of
8d591677690b 22 Specifying a version on the "pkg install" commandline makes no difference
Danek Duvall <danek.duvall@sun.com>
parents: 146
diff changeset
   462
                the release, branch, or timestamp components is None, it acts as
8d591677690b 22 Specifying a version on the "pkg install" commandline makes no difference
Danek Duvall <danek.duvall@sun.com>
parents: 146
diff changeset
   463
                a "don't care" value -- a versioned component always succeeds
8d591677690b 22 Specifying a version on the "pkg install" commandline makes no difference
Danek Duvall <danek.duvall@sun.com>
parents: 146
diff changeset
   464
                None.
8d591677690b 22 Specifying a version on the "pkg install" commandline makes no difference
Danek Duvall <danek.duvall@sun.com>
parents: 146
diff changeset
   465
30
f06ad6cb4b3f stop using flavour terminology
Stephen Hahn <sch@sun.com>
parents: 26
diff changeset
   466
                For CONSTRAINT_RELEASE, self is a successor to other if all of
f06ad6cb4b3f stop using flavour terminology
Stephen Hahn <sch@sun.com>
parents: 26
diff changeset
   467
                the components of other's release match, and there are later
59
eef94b0c0694 require dependencies; dependency following; pkg status; timestamp change
Stephen Hahn <sch@sun.com>
parents: 45
diff changeset
   468
                components of self's version.  The branch and datetime
30
f06ad6cb4b3f stop using flavour terminology
Stephen Hahn <sch@sun.com>
parents: 26
diff changeset
   469
                components are ignored.
f06ad6cb4b3f stop using flavour terminology
Stephen Hahn <sch@sun.com>
parents: 26
diff changeset
   470
f06ad6cb4b3f stop using flavour terminology
Stephen Hahn <sch@sun.com>
parents: 26
diff changeset
   471
                For CONSTRAINT_RELEASE_MAJOR and CONSTRAINT_RELEASE_MINOR, other
f06ad6cb4b3f stop using flavour terminology
Stephen Hahn <sch@sun.com>
parents: 26
diff changeset
   472
                is effectively truncated to [other[0]] and [other[0], other[1]]
f06ad6cb4b3f stop using flavour terminology
Stephen Hahn <sch@sun.com>
parents: 26
diff changeset
   473
                prior to being treated as for CONSTRAINT_RELEASE.
f06ad6cb4b3f stop using flavour terminology
Stephen Hahn <sch@sun.com>
parents: 26
diff changeset
   474
f06ad6cb4b3f stop using flavour terminology
Stephen Hahn <sch@sun.com>
parents: 26
diff changeset
   475
                Similarly for CONSTRAINT_BRANCH, the release fields of other and
f06ad6cb4b3f stop using flavour terminology
Stephen Hahn <sch@sun.com>
parents: 26
diff changeset
   476
                self are expected to be identical, and then the branches are
f06ad6cb4b3f stop using flavour terminology
Stephen Hahn <sch@sun.com>
parents: 26
diff changeset
   477
                compared as releases were for the CONSTRAINT_RELEASE* policies.
f06ad6cb4b3f stop using flavour terminology
Stephen Hahn <sch@sun.com>
parents: 26
diff changeset
   478
                """
f06ad6cb4b3f stop using flavour terminology
Stephen Hahn <sch@sun.com>
parents: 26
diff changeset
   479
f06ad6cb4b3f stop using flavour terminology
Stephen Hahn <sch@sun.com>
parents: 26
diff changeset
   480
                if constraint == None or constraint == CONSTRAINT_NONE:
f06ad6cb4b3f stop using flavour terminology
Stephen Hahn <sch@sun.com>
parents: 26
diff changeset
   481
                        return self > other
f06ad6cb4b3f stop using flavour terminology
Stephen Hahn <sch@sun.com>
parents: 26
diff changeset
   482
1537
00a5b4d54eb8 5872 List APIs required
Shawn Walker <srw@sun.com>
parents: 1516
diff changeset
   483
                if constraint == CONSTRAINT_AUTO and \
00a5b4d54eb8 5872 List APIs required
Shawn Walker <srw@sun.com>
parents: 1516
diff changeset
   484
                    type(other) == MatchingVersion:
175
8d591677690b 22 Specifying a version on the "pkg install" commandline makes no difference
Danek Duvall <danek.duvall@sun.com>
parents: 146
diff changeset
   485
                        if other.release and self.release:
1537
00a5b4d54eb8 5872 List APIs required
Shawn Walker <srw@sun.com>
parents: 1516
diff changeset
   486
                                if not other.release.is_subsequence(
00a5b4d54eb8 5872 List APIs required
Shawn Walker <srw@sun.com>
parents: 1516
diff changeset
   487
                                    self.release):
00a5b4d54eb8 5872 List APIs required
Shawn Walker <srw@sun.com>
parents: 1516
diff changeset
   488
                                        return False
00a5b4d54eb8 5872 List APIs required
Shawn Walker <srw@sun.com>
parents: 1516
diff changeset
   489
                        elif other.release and other.release != "*":
00a5b4d54eb8 5872 List APIs required
Shawn Walker <srw@sun.com>
parents: 1516
diff changeset
   490
                                return False
175
8d591677690b 22 Specifying a version on the "pkg install" commandline makes no difference
Danek Duvall <danek.duvall@sun.com>
parents: 146
diff changeset
   491
8d591677690b 22 Specifying a version on the "pkg install" commandline makes no difference
Danek Duvall <danek.duvall@sun.com>
parents: 146
diff changeset
   492
                        if other.branch and self.branch:
1537
00a5b4d54eb8 5872 List APIs required
Shawn Walker <srw@sun.com>
parents: 1516
diff changeset
   493
                                if not other.branch.is_subsequence(self.branch):
00a5b4d54eb8 5872 List APIs required
Shawn Walker <srw@sun.com>
parents: 1516
diff changeset
   494
                                        return False
00a5b4d54eb8 5872 List APIs required
Shawn Walker <srw@sun.com>
parents: 1516
diff changeset
   495
                        elif other.branch and other.branch != "*":
00a5b4d54eb8 5872 List APIs required
Shawn Walker <srw@sun.com>
parents: 1516
diff changeset
   496
                                return False
175
8d591677690b 22 Specifying a version on the "pkg install" commandline makes no difference
Danek Duvall <danek.duvall@sun.com>
parents: 146
diff changeset
   497
416
bbfe37efa018 2344 fmris could be smaller, faster, better
Dan Price <dp@eng.sun.com>
parents: 409
diff changeset
   498
                        if self.timestr and other.timestr:
1537
00a5b4d54eb8 5872 List APIs required
Shawn Walker <srw@sun.com>
parents: 1516
diff changeset
   499
                                if not (other.timestr == self.timestr or \
00a5b4d54eb8 5872 List APIs required
Shawn Walker <srw@sun.com>
parents: 1516
diff changeset
   500
                                    other.timestr == "*"):
00a5b4d54eb8 5872 List APIs required
Shawn Walker <srw@sun.com>
parents: 1516
diff changeset
   501
                                        return False
00a5b4d54eb8 5872 List APIs required
Shawn Walker <srw@sun.com>
parents: 1516
diff changeset
   502
                        elif other.timestr and other.timestr != "*":
00a5b4d54eb8 5872 List APIs required
Shawn Walker <srw@sun.com>
parents: 1516
diff changeset
   503
                                return False
175
8d591677690b 22 Specifying a version on the "pkg install" commandline makes no difference
Danek Duvall <danek.duvall@sun.com>
parents: 146
diff changeset
   504
1537
00a5b4d54eb8 5872 List APIs required
Shawn Walker <srw@sun.com>
parents: 1516
diff changeset
   505
                        return True
00a5b4d54eb8 5872 List APIs required
Shawn Walker <srw@sun.com>
parents: 1516
diff changeset
   506
                elif constraint == CONSTRAINT_AUTO:
00a5b4d54eb8 5872 List APIs required
Shawn Walker <srw@sun.com>
parents: 1516
diff changeset
   507
                        if other.release and self.release:
00a5b4d54eb8 5872 List APIs required
Shawn Walker <srw@sun.com>
parents: 1516
diff changeset
   508
                                if not other.release.is_subsequence(
00a5b4d54eb8 5872 List APIs required
Shawn Walker <srw@sun.com>
parents: 1516
diff changeset
   509
                                    self.release):
00a5b4d54eb8 5872 List APIs required
Shawn Walker <srw@sun.com>
parents: 1516
diff changeset
   510
                                        return False
00a5b4d54eb8 5872 List APIs required
Shawn Walker <srw@sun.com>
parents: 1516
diff changeset
   511
                        elif other.release:
00a5b4d54eb8 5872 List APIs required
Shawn Walker <srw@sun.com>
parents: 1516
diff changeset
   512
                                return False
00a5b4d54eb8 5872 List APIs required
Shawn Walker <srw@sun.com>
parents: 1516
diff changeset
   513
00a5b4d54eb8 5872 List APIs required
Shawn Walker <srw@sun.com>
parents: 1516
diff changeset
   514
                        if other.branch and self.branch:
00a5b4d54eb8 5872 List APIs required
Shawn Walker <srw@sun.com>
parents: 1516
diff changeset
   515
                                if not other.branch.is_subsequence(self.branch):
00a5b4d54eb8 5872 List APIs required
Shawn Walker <srw@sun.com>
parents: 1516
diff changeset
   516
                                        return False
00a5b4d54eb8 5872 List APIs required
Shawn Walker <srw@sun.com>
parents: 1516
diff changeset
   517
                        elif other.branch:
00a5b4d54eb8 5872 List APIs required
Shawn Walker <srw@sun.com>
parents: 1516
diff changeset
   518
                                return False
00a5b4d54eb8 5872 List APIs required
Shawn Walker <srw@sun.com>
parents: 1516
diff changeset
   519
00a5b4d54eb8 5872 List APIs required
Shawn Walker <srw@sun.com>
parents: 1516
diff changeset
   520
                        if self.timestr and other.timestr:
00a5b4d54eb8 5872 List APIs required
Shawn Walker <srw@sun.com>
parents: 1516
diff changeset
   521
                                if other.timestr != self.timestr:
00a5b4d54eb8 5872 List APIs required
Shawn Walker <srw@sun.com>
parents: 1516
diff changeset
   522
                                        return False
00a5b4d54eb8 5872 List APIs required
Shawn Walker <srw@sun.com>
parents: 1516
diff changeset
   523
                        elif other.timestr:
00a5b4d54eb8 5872 List APIs required
Shawn Walker <srw@sun.com>
parents: 1516
diff changeset
   524
                                return False
00a5b4d54eb8 5872 List APIs required
Shawn Walker <srw@sun.com>
parents: 1516
diff changeset
   525
00a5b4d54eb8 5872 List APIs required
Shawn Walker <srw@sun.com>
parents: 1516
diff changeset
   526
                        return True
175
8d591677690b 22 Specifying a version on the "pkg install" commandline makes no difference
Danek Duvall <danek.duvall@sun.com>
parents: 146
diff changeset
   527
30
f06ad6cb4b3f stop using flavour terminology
Stephen Hahn <sch@sun.com>
parents: 26
diff changeset
   528
                if constraint == CONSTRAINT_RELEASE:
36
b31b3587fb1c begin client catalog evaluation; fix bugs from refactoring
"Stephen Hahn <sch@sun.com>"
parents: 33
diff changeset
   529
                        return other.release.is_subsequence(self.release)
30
f06ad6cb4b3f stop using flavour terminology
Stephen Hahn <sch@sun.com>
parents: 26
diff changeset
   530
f06ad6cb4b3f stop using flavour terminology
Stephen Hahn <sch@sun.com>
parents: 26
diff changeset
   531
                if constraint == CONSTRAINT_RELEASE_MAJOR:
f06ad6cb4b3f stop using flavour terminology
Stephen Hahn <sch@sun.com>
parents: 26
diff changeset
   532
                        return other.release.is_same_major(self.release)
f06ad6cb4b3f stop using flavour terminology
Stephen Hahn <sch@sun.com>
parents: 26
diff changeset
   533
f06ad6cb4b3f stop using flavour terminology
Stephen Hahn <sch@sun.com>
parents: 26
diff changeset
   534
                if constraint == CONSTRAINT_RELEASE_MINOR:
f06ad6cb4b3f stop using flavour terminology
Stephen Hahn <sch@sun.com>
parents: 26
diff changeset
   535
                        return other.release.is_same_minor(self.release)
f06ad6cb4b3f stop using flavour terminology
Stephen Hahn <sch@sun.com>
parents: 26
diff changeset
   536
f06ad6cb4b3f stop using flavour terminology
Stephen Hahn <sch@sun.com>
parents: 26
diff changeset
   537
                if constraint == CONSTRAINT_BRANCH:
f06ad6cb4b3f stop using flavour terminology
Stephen Hahn <sch@sun.com>
parents: 26
diff changeset
   538
                        return other.branch.is_subsequence(self.branch)
f06ad6cb4b3f stop using flavour terminology
Stephen Hahn <sch@sun.com>
parents: 26
diff changeset
   539
f06ad6cb4b3f stop using flavour terminology
Stephen Hahn <sch@sun.com>
parents: 26
diff changeset
   540
                if constraint == CONSTRAINT_BRANCH_MAJOR:
f06ad6cb4b3f stop using flavour terminology
Stephen Hahn <sch@sun.com>
parents: 26
diff changeset
   541
                        return other.branch.is_same_major(self.branch)
f06ad6cb4b3f stop using flavour terminology
Stephen Hahn <sch@sun.com>
parents: 26
diff changeset
   542
f06ad6cb4b3f stop using flavour terminology
Stephen Hahn <sch@sun.com>
parents: 26
diff changeset
   543
                if constraint == CONSTRAINT_BRANCH_MINOR:
f06ad6cb4b3f stop using flavour terminology
Stephen Hahn <sch@sun.com>
parents: 26
diff changeset
   544
                        return other.branch.is_same_minor(self.branch)
f06ad6cb4b3f stop using flavour terminology
Stephen Hahn <sch@sun.com>
parents: 26
diff changeset
   545
f06ad6cb4b3f stop using flavour terminology
Stephen Hahn <sch@sun.com>
parents: 26
diff changeset
   546
                raise ValueError, "constraint has unknown value"
f06ad6cb4b3f stop using flavour terminology
Stephen Hahn <sch@sun.com>
parents: 26
diff changeset
   547
1537
00a5b4d54eb8 5872 List APIs required
Shawn Walker <srw@sun.com>
parents: 1516
diff changeset
   548
        @classmethod
00a5b4d54eb8 5872 List APIs required
Shawn Walker <srw@sun.com>
parents: 1516
diff changeset
   549
        def split(self, ver):
2199
7ddd3f2cfb0b 17710 matching version class parsing fails if build version is omitted
Shawn Walker <shawn.walker@oracle.com>
parents: 1698
diff changeset
   550
                """Takes an assumed valid version string and splits it into
1537
00a5b4d54eb8 5872 List APIs required
Shawn Walker <srw@sun.com>
parents: 1516
diff changeset
   551
                its components as a tuple of the form ((release, build_release,
00a5b4d54eb8 5872 List APIs required
Shawn Walker <srw@sun.com>
parents: 1516
diff changeset
   552
                branch, timestr), short_ver)."""
00a5b4d54eb8 5872 List APIs required
Shawn Walker <srw@sun.com>
parents: 1516
diff changeset
   553
00a5b4d54eb8 5872 List APIs required
Shawn Walker <srw@sun.com>
parents: 1516
diff changeset
   554
                # Locate and extract the time string.
00a5b4d54eb8 5872 List APIs required
Shawn Walker <srw@sun.com>
parents: 1516
diff changeset
   555
                timeidx = ver.find(":")
00a5b4d54eb8 5872 List APIs required
Shawn Walker <srw@sun.com>
parents: 1516
diff changeset
   556
                if timeidx != -1:
00a5b4d54eb8 5872 List APIs required
Shawn Walker <srw@sun.com>
parents: 1516
diff changeset
   557
                        timestr = ver[timeidx + 1:]
00a5b4d54eb8 5872 List APIs required
Shawn Walker <srw@sun.com>
parents: 1516
diff changeset
   558
                else:
00a5b4d54eb8 5872 List APIs required
Shawn Walker <srw@sun.com>
parents: 1516
diff changeset
   559
                        timeidx = None
00a5b4d54eb8 5872 List APIs required
Shawn Walker <srw@sun.com>
parents: 1516
diff changeset
   560
                        timestr = None
00a5b4d54eb8 5872 List APIs required
Shawn Walker <srw@sun.com>
parents: 1516
diff changeset
   561
00a5b4d54eb8 5872 List APIs required
Shawn Walker <srw@sun.com>
parents: 1516
diff changeset
   562
                # Locate and extract the branch string.
00a5b4d54eb8 5872 List APIs required
Shawn Walker <srw@sun.com>
parents: 1516
diff changeset
   563
                branchidx = ver.find("-")
00a5b4d54eb8 5872 List APIs required
Shawn Walker <srw@sun.com>
parents: 1516
diff changeset
   564
                if branchidx != -1:
00a5b4d54eb8 5872 List APIs required
Shawn Walker <srw@sun.com>
parents: 1516
diff changeset
   565
                        branch = ver[branchidx + 1:timeidx]
00a5b4d54eb8 5872 List APIs required
Shawn Walker <srw@sun.com>
parents: 1516
diff changeset
   566
                else:
00a5b4d54eb8 5872 List APIs required
Shawn Walker <srw@sun.com>
parents: 1516
diff changeset
   567
                        branchidx = timeidx
00a5b4d54eb8 5872 List APIs required
Shawn Walker <srw@sun.com>
parents: 1516
diff changeset
   568
                        branch = None
00a5b4d54eb8 5872 List APIs required
Shawn Walker <srw@sun.com>
parents: 1516
diff changeset
   569
00a5b4d54eb8 5872 List APIs required
Shawn Walker <srw@sun.com>
parents: 1516
diff changeset
   570
                # Locate and extract the build string.
00a5b4d54eb8 5872 List APIs required
Shawn Walker <srw@sun.com>
parents: 1516
diff changeset
   571
                buildidx = ver.find(",")
00a5b4d54eb8 5872 List APIs required
Shawn Walker <srw@sun.com>
parents: 1516
diff changeset
   572
                if buildidx != -1:
00a5b4d54eb8 5872 List APIs required
Shawn Walker <srw@sun.com>
parents: 1516
diff changeset
   573
                        build = ver[buildidx + 1:branchidx]
00a5b4d54eb8 5872 List APIs required
Shawn Walker <srw@sun.com>
parents: 1516
diff changeset
   574
                else:
00a5b4d54eb8 5872 List APIs required
Shawn Walker <srw@sun.com>
parents: 1516
diff changeset
   575
                        buildidx = branchidx
00a5b4d54eb8 5872 List APIs required
Shawn Walker <srw@sun.com>
parents: 1516
diff changeset
   576
                        build = None
00a5b4d54eb8 5872 List APIs required
Shawn Walker <srw@sun.com>
parents: 1516
diff changeset
   577
00a5b4d54eb8 5872 List APIs required
Shawn Walker <srw@sun.com>
parents: 1516
diff changeset
   578
                release = ver[:buildidx]
00a5b4d54eb8 5872 List APIs required
Shawn Walker <srw@sun.com>
parents: 1516
diff changeset
   579
00a5b4d54eb8 5872 List APIs required
Shawn Walker <srw@sun.com>
parents: 1516
diff changeset
   580
                build_release = ""
00a5b4d54eb8 5872 List APIs required
Shawn Walker <srw@sun.com>
parents: 1516
diff changeset
   581
                if build is not None:
00a5b4d54eb8 5872 List APIs required
Shawn Walker <srw@sun.com>
parents: 1516
diff changeset
   582
                        build_release = build
00a5b4d54eb8 5872 List APIs required
Shawn Walker <srw@sun.com>
parents: 1516
diff changeset
   583
00a5b4d54eb8 5872 List APIs required
Shawn Walker <srw@sun.com>
parents: 1516
diff changeset
   584
                if branch is not None:
00a5b4d54eb8 5872 List APIs required
Shawn Walker <srw@sun.com>
parents: 1516
diff changeset
   585
                        short_ver = release + "-" + branch
00a5b4d54eb8 5872 List APIs required
Shawn Walker <srw@sun.com>
parents: 1516
diff changeset
   586
                else:
00a5b4d54eb8 5872 List APIs required
Shawn Walker <srw@sun.com>
parents: 1516
diff changeset
   587
                        short_ver = release
00a5b4d54eb8 5872 List APIs required
Shawn Walker <srw@sun.com>
parents: 1516
diff changeset
   588
                return (release, build_release, branch, timestr), short_ver
00a5b4d54eb8 5872 List APIs required
Shawn Walker <srw@sun.com>
parents: 1516
diff changeset
   589
852
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   590
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   591
class MatchingVersion(Version):
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   592
        """An alternative for Version with (much) weaker rules about its format.
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   593
        This is intended to accept user input with globbing characters."""
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   594
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   595
        def __init__(self, version_string, build_string):
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   596
                # XXX If illegally formatted, raise exception.
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   597
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   598
                if version_string is None or not len(version_string):
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   599
                        raise IllegalVersion, "Version cannot be empty"
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   600
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   601
2199
7ddd3f2cfb0b 17710 matching version class parsing fails if build version is omitted
Shawn Walker <shawn.walker@oracle.com>
parents: 1698
diff changeset
   602
                (release, build_release, branch, timestr), ignored = \
7ddd3f2cfb0b 17710 matching version class parsing fails if build version is omitted
Shawn Walker <shawn.walker@oracle.com>
parents: 1698
diff changeset
   603
                    self.split(version_string)
7ddd3f2cfb0b 17710 matching version class parsing fails if build version is omitted
Shawn Walker <shawn.walker@oracle.com>
parents: 1698
diff changeset
   604
                if not build_release:
7ddd3f2cfb0b 17710 matching version class parsing fails if build version is omitted
Shawn Walker <shawn.walker@oracle.com>
parents: 1698
diff changeset
   605
                        build_release = build_string
852
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   606
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   607
                #
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   608
                # Error checking and conversion from strings to objects
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   609
                # begins here.
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   610
                #
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   611
                try:
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   612
                        #
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   613
                        # Every component of the version (after the first) is
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   614
                        # optional, if not provided, assume "*" (wildcard).
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   615
                        #
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   616
                        for attr, vals in (
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   617
                            ('release', (release,)),
2199
7ddd3f2cfb0b 17710 matching version class parsing fails if build version is omitted
Shawn Walker <shawn.walker@oracle.com>
parents: 1698
diff changeset
   618
                            ('build_release', (build_release, "*")),
852
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   619
                            ('branch', (branch, "*")),
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   620
                            ('timestr', (timestr, "*"))):
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   621
                                for val in vals:
2199
7ddd3f2cfb0b 17710 matching version class parsing fails if build version is omitted
Shawn Walker <shawn.walker@oracle.com>
parents: 1698
diff changeset
   622
                                        if not val:
852
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   623
                                                continue
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   624
                                        if attr != 'timestr':
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   625
                                                val = MatchingDotSequence(val)
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   626
                                        setattr(self, attr, val)
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   627
                                        break
933
601797170f72 3739 pkg.depotd traceback on malformed requests
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 856
diff changeset
   628
                except IllegalDotSequence, e:
601797170f72 3739 pkg.depotd traceback on malformed requests
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 856
diff changeset
   629
                        raise IllegalVersion("Bad Version: %s" % e)
852
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   630
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   631
                outstr = str(release)
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   632
                if build_release is not None:
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   633
                        outstr += "," + str(build_release)
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   634
                if branch is not None:
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   635
                        outstr += "-" + str(branch)
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   636
                if timestr is not None:
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   637
                        outstr += ":" + timestr
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   638
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   639
                # Store the re-constructed input value for use as a string
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   640
                # representation of this object.
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   641
                self.__original = outstr
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   642
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   643
        def __str__(self):
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   644
                return self.__original
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   645
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   646
        def get_timestamp(self):
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   647
                if self.timestr == "*":
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   648
                        return "*"
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   649
                return Version.get_timestamp(self)
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   650
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   651
        def __ne__(self, other):
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   652
                if not isinstance(other, Version):
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   653
                        return True
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   654
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   655
                if self.release == other.release and \
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   656
                    self.build_release == other.build_release and \
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   657
                    self.branch == other.branch and \
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   658
                    ((self.timestr == other.timestr) or ("*" in (self.timestr,
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   659
                        other.timestr))):
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   660
                        return False
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   661
                return True
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   662
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   663
        def __eq__(self, other):
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   664
                if not isinstance(other, Version):
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   665
                        return False
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   666
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   667
                if self.release == other.release and \
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   668
                    self.build_release == other.build_release and \
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   669
                    self.branch == other.branch and \
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   670
                    ((self.timestr == other.timestr) or ("*" in (self.timestr,
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   671
                        other.timestr))):
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   672
                        return True
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   673
                return False
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   674
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   675
        def __lt__(self, other):
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   676
                """Returns True if 'self' comes before 'other', and vice versa.
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   677
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   678
                If exactly one of the release values of the versions is None or
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   679
                "*", then that version is less than the other.  The same applies
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   680
                to the branch and timestamp components.
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   681
                """
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   682
                if not isinstance(other, Version):
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   683
                        return False
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   684
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   685
                if self.release == "*" and other.release != "*":
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   686
                        return True
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   687
                if self.release < other.release:
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   688
                        return True
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   689
                if self.release != other.release:
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   690
                        return False
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   691
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   692
                if self.build_release == "*" and other.build_release != "*":
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   693
                        return True
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   694
                if self.build_release < other.build_release:
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   695
                        return True
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   696
                if self.build_release != other.build_release:
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   697
                        return False
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   698
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   699
                if self.branch == "*" and other.branch != "*":
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   700
                        return True
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   701
                if self.branch < other.branch:
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   702
                        return True
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   703
                if self.branch != other.branch:
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   704
                        return False
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   705
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   706
                if self.timestr == "*" and other.timestr != "*":
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   707
                        return True
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   708
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   709
                return self.timestr < other.timestr
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   710
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   711
        def __gt__(self, other):
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   712
                """Returns True if 'self' comes after 'other', and vice versa.
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   713
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   714
                If exactly one of the release values of the versions is None or
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   715
                "*", then that version is less than the other.  The same applies
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   716
                to the branch and timestamp components.
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   717
                """
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   718
                if not isinstance(other, Version):
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   719
                        return True
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   720
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   721
                if self.release == "*" and other.release != "*":
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   722
                        return False
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   723
                if self.release > other.release:
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   724
                        return True
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   725
                if self.release != other.release:
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   726
                        return False
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   727
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   728
                if self.build_release == "*" and other.build_release != "*":
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   729
                        return False
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   730
                if self.build_release > other.build_release:
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   731
                        return True
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   732
                if self.build_release != other.build_release:
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   733
                        return False
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   734
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   735
                if self.branch == "*" and other.branch != "*":
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   736
                        return False
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   737
                if self.branch > other.branch:
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   738
                        return True
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   739
                if self.branch != other.branch:
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   740
                        return False
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   741
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   742
                if self.timestr == "*" and other.timestr != "*":
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   743
                        return False
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   744
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   745
                return self.timestr > other.timestr
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   746
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   747
        def __hash__(self):
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   748
                # If a timestamp is present, it's enough to hash on, and is
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   749
                # nicely unique.  If not, use release and branch, which are
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   750
                # not very unique.
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   751
                if self.timestr and self.timestr != "*":
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   752
                        return hash(self.timestr)
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   753
                else:
96c4a4dace99 5999 catalog.extract_matching_fmris - version filtering not correct
Shawn Walker <Shawn.Walker@Sun.COM>
parents: 576
diff changeset
   754
                        return hash((self.release, self.branch))