bodhi/masher.py | 10 +++-------
bodhi/model.py | 3 ++-
comps/CVS/Root | 2 +-
3 files changed, 6 insertions(+), 9 deletions(-)
New commits:
commit 31d8f0c475b3d0d8c4863d45de7be9081c111017
Author: Luke Macken <lmacken(a)redhat.com>
Date: Wed Jan 27 09:05:15 2010 -0500
Use the tg_url method when injecting URLs in PackageUpdate.__str__
diff --git a/bodhi/model.py b/bodhi/model.py
index fee8aa8..4a7c14e 100644
--- a/bodhi/model.py
+++ b/bodhi/model.py
@@ -29,6 +29,7 @@ from turbogears.database import PackageHub
from os.path import isfile, join
from textwrap import wrap
+from fedora.tg.util import tg_url
from bodhi import buildsys, mail
from bodhi.util import get_nvr, rpm_fileheader, header, get_age, get_age_in_days
from bodhi.util import Singleton, authorized_user, flash_log, build_evr, url
@@ -591,7 +592,7 @@ class PackageUpdate(SQLObject):
subsequent_indent=' ' * 13, width=67)
comments.append(u'\n'.join(text) + '\n')
val += u'\n'.join(comments).lstrip()
- val += u"\n %s\n" % (config.get('base_address') +
url(self.get_url()))
+ val += u"\n %s\n" % (config.get('base_address') +
tg_url(self.get_url()))
return val
def get_build_tag(self):
commit 921f3b87657257be3e10847e0667f67b33f274d8
Author: Luke Macken <lmacken(a)redhat.com>
Date: Tue Jan 26 19:33:17 2010 -0500
Use subprocess.call(..., cwd=path) instead of os.chdir
diff --git a/bodhi/masher.py b/bodhi/masher.py
index 97ccacb..da1fb4f 100644
--- a/bodhi/masher.py
+++ b/bodhi/masher.py
@@ -439,17 +439,13 @@ class MashTask(Thread):
our repositories
"""
log.debug("Updating comps...")
- olddir = os.getcwd()
comps_dir = config.get('comps_dir')
if not exists(comps_dir):
- os.chdir(dirname(comps_dir))
cmd = 'cvs -d %s co comps' % config.get('comps_cvs')
log.debug("running command: %s" % cmd)
- subprocess.call(cmd, shell=True)
- os.chdir(comps_dir)
- subprocess.call('cvs update', shell=True)
- subprocess.call('make', shell=True)
- os.chdir(olddir)
+ subprocess.call(cmd, shell=True, cwd=comps_dir)
+ subprocess.call('cvs update', shell=True, cwd=comps_dir)
+ subprocess.call('make', shell=True, cwd=comps_dir)
def update_symlinks(self):
""" Stage our updates repository.
commit a31e1ea7305af613d7028dd1f19a555c6e5d1b3d
Author: Luke Macken <lmacken(a)redhat.com>
Date: Tue Jan 26 19:31:55 2010 -0500
Update our comps CVS root
diff --git a/comps/CVS/Root b/comps/CVS/Root
index 6369fc0..d4915b4 100644
--- a/comps/CVS/Root
+++ b/comps/CVS/Root
@@ -1 +1 @@
-:pserver:anonymous@cvs.fedora.redhat.com:/cvs/pkgs
+:pserver:anonymous@cvs.fedoraproject.org:/cvs/pkgs
Show replies by date