diff options
| author | Jesse Keating <jkeating@redhat.com> | 2010-08-02 15:39:18 -0700 |
|---|---|---|
| committer | Jesse Keating <jkeating@redhat.com> | 2010-08-11 22:09:06 -0700 |
| commit | 05305e31598acab02c1ca42737d4aad7ed3c0419 (patch) | |
| tree | 1427f7488fbec2f9d295b12cfbde5e84dea99226 /src/pyfedpkg/__init__.py | |
| parent | f0ea3257597f05103484c78eaf99b36f412f63da (diff) | |
| download | fedora-packager-05305e31598acab02c1ca42737d4aad7ed3c0419.tar.gz fedora-packager-05305e31598acab02c1ca42737d4aad7ed3c0419.tar.xz fedora-packager-05305e31598acab02c1ca42737d4aad7ed3c0419.zip | |
Revert "set the loacl rpms macros to match whats set in olpc-release,"
This reverts commit 8ca17966d912f8f22d30bab217d085ec7f275adf.
Diffstat (limited to 'src/pyfedpkg/__init__.py')
| -rw-r--r-- | src/pyfedpkg/__init__.py | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/pyfedpkg/__init__.py b/src/pyfedpkg/__init__.py index ecb111d..fd2a84c 100644 --- a/src/pyfedpkg/__init__.py +++ b/src/pyfedpkg/__init__.py @@ -785,21 +785,18 @@ class PackageModule: if self.branch.startswith('f'): self.distval = self.branch.split('f')[1] self.distvar = 'fedora' - self.distshort = 'fc%s' % self.distval self.dist = '.fc%s' % self.distval self.target = 'dist-f%s-updates-candidate' % self.distval self.mockconfig = 'fedora-%s-%s' % (self.distval, self.localarch) elif self.branch.startswith('el'): self.distval = self.branch.split('el')[1] - self.distvar = 'rhel' - self.distshort = 'el%s' % self.distval + self.distvar = 'epel' self.dist = '.el%s' % self.distval self.target = 'dist-%sE-epel-testing-candidate' % self.distval self.mockconfig = 'epel-%s-%s' % (self.distval, self.localarch) elif self.branch.startswith('olpc'): self.distval = self.branch.split('olpc')[1] self.distvar = 'olpc' - self.distshort = 'olpc%s' % self.distval self.dist = '.olpc%s' % self.distval self.target = 'dist-olpc%s' % self.distval # If we don't match one of the above, assume master or a branch of @@ -818,7 +815,7 @@ class PackageModule: "--define '_rpmdir %s'" % path, "--define 'dist %s'" % self.dist, "--define '%s %s'" % (self.distvar, self.distval), - "--define '%s 1'" % self.distshort] + "--define '%s 1'" % self.distvar] self.ver = self.getver() self.rel = self.getrel() self.nvr = '%s-%s-%s' % (self.module, self.ver, self.rel) |