Repository : http://git.fedorahosted.org/cgit/copr.git On branch : master commit a94a894e678e7a38ef27aa99b2eb56fd1a180e74 Author: Valentin Gologuzov <vgologuz(a)redhat.com&gt; Date: Mon Dec 15 13:36:18 2014 +0100 [backend] fixed config option `results_baseurl` usage, in mockremote backend/backend/mockremote/__init__.py | 6 +++--- backend/run/copr_mockremote.py | 4 ++-- backend/tests/mockremote/test_mockremote.py | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/backend/backend/mockremote/__init__.py b/backend/backend/mockremote/__init__.py index 380477e..733463a 100755 --- a/backend/backend/mockremote/__init__.py +++ b/backend/backend/mockremote/__init__.py @@ -97,7 +97,7 @@ class MockRemote(object): :ivar do_sign: enable package signing, require configured signer host and correct /etc/sign.conf :ivar frontend_base_url: url to the copr frontend - :ivar results_base_url: base url for the built results + :ivar results_baseurl: base url for the built results :ivar remote_basedir: basedir on builder :ivar remote_tempdir: tempdir on builder @@ -109,7 +109,7 @@ class MockRemote(object): self.opts = Bunch( do_sign=False, frontend_base_url=None, - results_base_url=u"", + results_baseurl=u"", build_user=DEF_BUILD_USER, remote_basedir=DEF_REMOTE_BASEDIR, remote_tempdir=None, @@ -240,7 +240,7 @@ class MockRemote(object): r_log.close() def do_createrepo(self): - base_url = "/".join([self.opts.results_base_url, self.job.project_owner, + base_url = "/".join([self.opts.results_baseurl, self.job.project_owner, self.job.project_name, self.job.chroot]) self.callback.log("Createrepo:: owner: {}; project: {}; " "front url: {}; path: {}; base_url: {}" diff --git a/backend/run/copr_mockremote.py b/backend/run/copr_mockremote.py index 1d7a8c6..191de24 100644 --- a/backend/run/copr_mockremote.py +++ b/backend/run/copr_mockremote.py @@ -61,7 +61,7 @@ def parse_args(args): help="output very little to the terminal") parser.add_option("-f", "--front_url", dest="front_url", help="copr frontend url") - parser.add_option("--results_url", dest="results_base_url", + parser.add_option("--results_url", dest="results_baseurl", help="backend base url for built packages") opts, args = parser.parse_args(args) @@ -135,7 +135,7 @@ def main(args): do_sign=opts.do_sign, callback=callback, front_url=opts.front_url, - results_base_url=opts.results_base_url, + results_base_url=opts.results_baseurl, ) # FIXMES diff --git a/backend/tests/mockremote/test_mockremote.py b/backend/tests/mockremote/test_mockremote.py index d868b02..5c88f94 100644 --- a/backend/tests/mockremote/test_mockremote.py +++ b/backend/tests/mockremote/test_mockremote.py @@ -108,7 +108,7 @@ class TestMockRemote(object): } self.OPTS = Bunch({ "do_sign": False, - "results_base_url": self.BASE_URL, + "results_baseurl": self.BASE_URL, "frontend_base_url": self.FRONT_URL, })