From 9617fd25a19f6bedd5ab9626ffb2a930e965ca05 Mon Sep 17 00:00:00 2001 From: Corentin Chary Date: Tue, 24 Jul 2012 07:59:00 +0200 Subject: [PATCH] djeuscan: add cp() and cpv() for Package and Version Signed-off-by: Corentin Chary --- euscanwww/djeuscan/models.py | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/euscanwww/djeuscan/models.py b/euscanwww/djeuscan/models.py index 5101ea8..0c38909 100644 --- a/euscanwww/djeuscan/models.py +++ b/euscanwww/djeuscan/models.py @@ -88,9 +88,12 @@ class Package(models.Model): class Meta: unique_together = ['category', 'name'] - def __unicode__(self): + def cp(self): return '%s/%s' % (self.category, self.name) + def __unicode__(self): + return self.cp() + def save(self, *args, **kwargs): self.full_clean() @@ -137,10 +140,17 @@ class Version(models.Model): class Meta: unique_together = ['package', 'slot', 'revision', 'version', 'overlay'] + def cpv(self): + return '%s/%s-%s-%s' % ( + self.package.category, self.package.name, self.version, + self.revision if self.revision != 'r0' else '' + ) + def __unicode__(self): return '%s/%s-%s-%s:%s [%s]' % ( self.package.category, self.package.name, self.version, - self.revision, self.slot, self.overlay or "" + self.revision if self.revision != 'r0' else '', + self.slot, self.overlay or "" ) def save(self, *args, **kwargs):