From 347fdf5e5fde897b4b8c73a2772069304f47e3c1 Mon Sep 17 00:00:00 2001 From: Allen S. Rout Date: Mar 13 2012 21:15:15 +0000 Subject: Switch '.format' invocations to '%'; backward compatible --- diff --git a/r2spec/rpackage.py b/r2spec/rpackage.py index fc5354d..55dbf22 100644 --- a/r2spec/rpackage.py +++ b/r2spec/rpackage.py @@ -124,7 +124,7 @@ class RPackage(object): return url = self.source0.rsplit('/', 1)[0] - url = '{url}/{source}'.format(url=url, source=self.source) + url = '%s/%s' % (url,self.source) self.log.info('Downloading %s' % url) remotefile = urllib2.urlopen(url) @@ -234,8 +234,7 @@ class RPackage(object): self.source0 = self.config.get(repo, 'source') if self.up_version != self.down_version: self.source0 = self.source0.replace('%{version}', self.up_version) - self.source = '{name}_{version}.tar.gz'.format(name=self.name, - version=self.up_version) + self.source = '%s_%s.tar.gz' % (self.name,self.up_version) def set_repo(self, reponame): """ This function find the URL and Source0 tag for the spec file @@ -245,6 +244,7 @@ class RPackage(object): """ for section in self.config.sections(): if section == 'repo:%s' % reponame: - self.url = self.config.get(section, 'url'.format(name=self.name)) + """ Not sure why this format is getting filled out...""" + self.url = self.config.get(section, 'url' % (self.name)) self.source0 = self.config.get(section, 'source') break