This repository has been archived by the owner. It is now read-only.
Permalink
Browse files

fix combinations display

  • Loading branch information...
sigma committed Apr 8, 2012
1 parent 3fc7ba1 commit d49a1927bcc9e76db233651521c9432b436434e7
Showing with 6 additions and 6 deletions.
  1. +1 −1 emacs/projects/_base.py
  2. +5 −5 emacs/projects/magit.py
View
@@ -76,7 +76,7 @@ def getAssignments(self):
if not self.validateFeature(proposed, expected):
fits = False
break
- combo_tag[key] = proposed
+ combo_tag[key] = expected
if fits:
slaves.append(slave.slavename)
if slaves:
View
@@ -11,13 +11,13 @@
class MagitProject(EmacsGitProject):
+ _emacs24 = EmacsVersionIdentifier(kind="gnu", version="24")
+ _emacs23 = EmacsVersionIdentifier(kind="gnu", version="23")
+
_project_name = 'magit'
_project_combinations = {'os': ['lx-oneiric', 'osx-lion'],
'arch': ['x64'],
- 'emacs': [EmacsVersionIdentifier(kind="gnu",
- version="24"),
- EmacsVersionIdentifier(kind="gnu",
- version="23")]}
+ 'emacs': [_emacs24, _emacs23]}
_project_git_repo = 'git://github.com/magit/magit.git'
_project_git_branches = ['maint', 'master', 'next']
@@ -67,7 +67,7 @@ def getTestingFactory(self, branch):
return factory
def getFactory(self, branch, combo):
- if not EmacsVersionIdentifier(kind="gnu", version="24")(combo['emacs']):
+ if not self._emacs24 == combo['emacs']:
return self.getBasicFactory(branch)
if branch == "maint":

0 comments on commit d49a192

Please sign in to comment.