[gentoo-commits] proj/gentoo-packages:master commit in: gpackages/apps/packages/, gpackages/libs/

[Slava Bacherikov]

commit:     e3f7b8cb4d32e221c64ec361032d76d58a261588
Author:     Slava Bacherikov <slava <AT> bacher09 <DOT> org>
AuthorDate: Tue May 29 14:47:59 2012 +0000
Commit:     Slava Bacherikov <slava <AT> bacherikov <DOT> org <DOT> ua>
CommitDate: Tue May 29 14:47:59 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-packages.git;a=commit;h=e3f7b8cb

Changes in keywords.

---
 gpackages/apps/packages/managers.py |    2 +-
 gpackages/apps/packages/models.py   |   17 ++++++++++++-----
 gpackages/libs/porttree.py          |   15 ++++++++++-----
 3 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/gpackages/apps/packages/managers.py b/gpackages/apps/packages/managers.py
index dd9c2cb..a9b514b 100644
--- a/gpackages/apps/packages/managers.py
+++ b/gpackages/apps/packages/managers.py
@@ -35,7 +35,7 @@ class KeywordMixin(object):
         if keyword is not None:
             if isinstance(keyword, Keyword):
                 arch, created = packages.models.ArchesModel.objects.get_or_create(name = keyword.name)
-                kwargs.update({'arch': arch, 'is_stable': keyword.is_stable })
+                kwargs.update({'arch': arch, 'status': keyword.status})
             else:
                 raise ValueError("Bad keyword object")
 

diff --git a/gpackages/apps/packages/models.py b/gpackages/apps/packages/models.py
index 1d2fbe7..0ef5e8c 100644
--- a/gpackages/apps/packages/models.py
+++ b/gpackages/apps/packages/models.py
@@ -97,8 +97,8 @@ class LicensModel(models.Model):
 class EbuildModel(models.Model):
     package = models.ForeignKey(PackageModel)
     #repository = models.ForeignKey(RepositoryModel)
-    version = models.CharField(max_length = 16)
-    revision = models.CharField(max_length = 6)
+    version = models.CharField(max_length = 26)
+    revision = models.CharField(max_length = 12)
     use_flags = models.ManyToManyField(UseFlagModel)
     licenses = models.ManyToManyField(LicensModel)
     license = models.CharField(max_length = 254, blank = True )
@@ -168,14 +168,21 @@ class EbuildModel(models.Model):
             
 
 class Keyword(models.Model):
+    STATUS_CHOICES = (
+        (0, 'STABLE'),
+        (1, 'NEED TESTING'),
+        (2, 'NOT WORK')
+    )
+    status_repr = ['','~','-']
+
     ebuild = models.ForeignKey(EbuildModel)
     arch = models.ForeignKey(ArchesModel)
-    is_stable = models.BooleanField() 
+    status = models.PositiveSmallIntegerField(choices = STATUS_CHOICES)
 
     objects = managers.KeywordManager()
 
     def __unicode__(self):
-        return ('' if self.is_stable else '~' ) + str(self.arch)
+        return self.status_repr[self.status] + str(self.arch)
         
 
     def init_by_keyword(self, keyword, ebuild):
@@ -184,7 +191,7 @@ class Keyword(models.Model):
         elif isinstance(ebuild, Ebuild):
             self.ebuild, created = EbuildModel.objects.get_or_create(ebuild = ebuild)
         self.arch, created = ArchesModel.objects.get_or_create(name = keyword.name)
-        self.is_stable = keyword.is_stable
+        self.status = keyword.status
 
     class Meta:
         unique_together = ('ebuild', 'arch')

diff --git a/gpackages/libs/porttree.py b/gpackages/libs/porttree.py
index 475a642..c50b74d 100644
--- a/gpackages/libs/porttree.py
+++ b/gpackages/libs/porttree.py
@@ -53,15 +53,20 @@ class Use(ToStrMixin):
 
 
 class Keyword(ToStrMixin):
-    def __init__(self, name, is_stable = True):
-        if name[0] == '~':
+    status_repr = ['','~','-']
+    
+    def __init__(self, name, status = 0):
+        if name.startswith('~'):
+            name = name[1:]
+            status = 1
+        elif name.startswith('-'):
             name = name[1:]
-            is_stable = False
+            status = 2
         self.name = name
-        self.is_stable = is_stable
+        self.status = status
 
     def __unicode__(self):
-        return ('' if self.is_stable else '~' ) + self.name
+        return self.status_repr[self.status] + self.name
 
 
 class Portage(object):