| 1 |
commit: 7be3203e948de4fa4ea78554cf5107b79e5fddbd |
| 2 |
Author: Slava Bacherikov <slava <AT> bacher09 <DOT> org> |
| 3 |
AuthorDate: Thu Jun 7 14:05:27 2012 +0000 |
| 4 |
Commit: Slava Bacherikov <slava <AT> bacherikov <DOT> org <DOT> ua> |
| 5 |
CommitDate: Thu Jun 7 14:05:27 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-packages.git;a=commit;h=7be3203e |
| 7 |
|
| 8 |
Del unused code in managers. |
| 9 |
|
| 10 |
--- |
| 11 |
gpackages/apps/packages/managers.py | 40 +--------------------------------- |
| 12 |
1 files changed, 2 insertions(+), 38 deletions(-) |
| 13 |
|
| 14 |
diff --git a/gpackages/apps/packages/managers.py b/gpackages/apps/packages/managers.py |
| 15 |
index cfde91e..c4ab013 100644 |
| 16 |
--- a/gpackages/apps/packages/managers.py |
| 17 |
+++ b/gpackages/apps/packages/managers.py |
| 18 |
@@ -44,7 +44,8 @@ class KeywordMixin(object):#{{{ |
| 19 |
def get_or_create(self, keyword=None, **kwargs): |
| 20 |
if keyword is not None: |
| 21 |
if isinstance(keyword, Keyword): |
| 22 |
- arch, created = packages.models.ArchesModel.objects.get_or_create(name = keyword.name) |
| 23 |
+ arch, created = packages.models.ArchesModel.objects \ |
| 24 |
+ .get_or_create(name = keyword.name) |
| 25 |
kwargs.update({'arch': arch, 'status': keyword.status}) |
| 26 |
else: |
| 27 |
raise ValueError("Bad keyword object") |
| 28 |
@@ -53,43 +54,6 @@ class KeywordMixin(object):#{{{ |
| 29 |
|
| 30 |
|
| 31 |
class EbuildMixin(object):#{{{ |
| 32 |
- #def create(self, **kwargs): |
| 33 |
- #if 'ebuild' in kwargs: |
| 34 |
- #obj = self.model(**kwargs) |
| 35 |
- #else: |
| 36 |
- #obj = super(EbuildMixin, self).create(**kwargs) |
| 37 |
- #return obj |
| 38 |
- |
| 39 |
- #def get_or_create(self, **kwargs): |
| 40 |
- #assert kwargs, \ |
| 41 |
- #'get_or_create() must be passed at least one keyword argument' |
| 42 |
- #defaults = kwargs.pop('defaults', {}) |
| 43 |
- #lookup = kwargs.copy() |
| 44 |
- #for f in self.model._meta.fields: |
| 45 |
- #if f.attname in lookup: |
| 46 |
- #lookup[f.name] = lookup.pop(f.attname) |
| 47 |
- #try: |
| 48 |
- #self._for_write = True |
| 49 |
- #return self.get(**lookup), False |
| 50 |
- #except self.model.DoesNotExist: |
| 51 |
- #try: |
| 52 |
- #params = dict([(k, v) for k, v in kwargs.items() if '__' not in k]) |
| 53 |
- #params.update(defaults) |
| 54 |
- #sid = transaction.savepoint(using=self.db) |
| 55 |
- #obj = self.model(**params) |
| 56 |
- #if 'ebuild' not in kwargs: |
| 57 |
- #obj.save(force_insert=True, using=self.db) |
| 58 |
- #transaction.savepoint_commit(sid, using=self.db) |
| 59 |
- #return obj, True |
| 60 |
- #except IntegrityError as e: |
| 61 |
- #transaction.savepoint_rollback(sid, using=self.db) |
| 62 |
- #exc_info = sys.exc_info() |
| 63 |
- #try: |
| 64 |
- #return self.get(**lookup), False |
| 65 |
- #except self.model.DoesNotExist: |
| 66 |
- ## Re-raise the IntegrityError with its original traceback. |
| 67 |
- #raise exc_info[1], None, exc_info[2] |
| 68 |
- |
| 69 |
|
| 70 |
def get(self, ebuild=None,package = None, *args, **kwargs): |
| 71 |
if ebuild is not None and isinstance(ebuild, Ebuild): |
Archives