1 files changed, 57 insertions, 2 deletions
diff --git a/packages/models.py b/packages/models.py
index 5dbdea45..a950bddb 100644
--- a/packages/models.py
+++ b/packages/models.py
@@ -1,5 +1,7 @@
+from datetime import datetime
+
 from django.db import models
-from django.db.models.signals import post_save
+from django.db.models.signals import pre_save, post_save
 from django.contrib.auth.models import User
 
 class PackageRelation(models.Model):
@@ -18,6 +20,7 @@ class PackageRelation(models.Model):
     pkgbase = models.CharField(max_length=255)
     user = models.ForeignKey(User, related_name="package_relations")
     type = models.PositiveIntegerField(choices=TYPE_CHOICES, default=MAINTAINER)
+    created = models.DateTimeField(editable=False)
 
     def get_associated_packages(self):
         # TODO: delayed import to avoid circular reference
@@ -45,7 +48,7 @@ class PackageGroup(models.Model):
     name = models.CharField(max_length=255)
 
     def __unicode__(self):
-        return "%s: %s" % (name, pkg)
+        return "%s: %s" % (self.name, self.pkg)
 
 class License(models.Model):
     pkg = models.ForeignKey('main.Package', related_name='licenses')
@@ -57,6 +60,50 @@ class License(models.Model):
     class Meta:
         ordering = ['name']
 
+class Conflict(models.Model):
+    pkg = models.ForeignKey('main.Package', related_name='conflicts')
+    name = models.CharField(max_length=255, db_index=True)
+    comparison = models.CharField(max_length=255, default='')
+    version = models.CharField(max_length=255, default='')
+
+    def __unicode__(self):
+        if self.version:
+            return u'%s%s%s' % (self.name, self.comparison, self.version)
+        return self.name
+
+    class Meta:
+        ordering = ['name']
+
+class Provision(models.Model):
+    pkg = models.ForeignKey('main.Package', related_name='provides')
+    name = models.CharField(max_length=255, db_index=True)
+    # comparison must be '=' for provides
+    comparison = '='
+    version = models.CharField(max_length=255, default='')
+
+    def __unicode__(self):
+        if self.version:
+            return u'%s=%s' % (self.name, self.version)
+        return self.name
+
+    class Meta:
+        ordering = ['name']
+
+class Replacement(models.Model):
+    pkg = models.ForeignKey('main.Package', related_name='replaces')
+    name = models.CharField(max_length=255, db_index=True)
+    comparison = models.CharField(max_length=255, default='')
+    version = models.CharField(max_length=255, default='')
+
+    def __unicode__(self):
+        if self.version:
+            return u'%s%s%s' % (self.name, self.comparison, self.version)
+        return self.name
+
+    class Meta:
+        ordering = ['name']
+
+
 def remove_inactive_maintainers(sender, instance, created, **kwargs):
     # instance is an auth.models.User; we want to remove any existing
     # maintainer relations if the user is no longer active
@@ -65,7 +112,15 @@ def remove_inactive_maintainers(sender, instance, created, **kwargs):
                 type=PackageRelation.MAINTAINER)
         maint_relations.delete()
 
+def set_created_field(sender, **kwargs):
+    # We use this same callback for both Isos and Tests
+    obj = kwargs['instance']
+    if not obj.created:
+        obj.created = datetime.utcnow()
+
 post_save.connect(remove_inactive_maintainers, sender=User,
         dispatch_uid="packages.models")
+pre_save.connect(set_created_field, sender=PackageRelation,
+        dispatch_uid="packages.models")
 
 # vim: set ts=4 sw=4 et: