From aaa8e3e90dfe4e3c242487b7286ee561e1e3e811 Mon Sep 17 00:00:00 2001 From: Stanislav Ochotnicky Date: Sep 20 2012 16:14:52 +0000 Subject: Fix working with Sources that have equal to %{name} In other words working with spec files with this: Source1: %{name} Would not work in some cases when using "f-r -rpn %{name}" due to directory that f-r is trying to create being the same as Source file. Probably not ideal solution either, but at least gets rid of most common occurences --- diff --git a/src/FedoraReview/abstract_bug.py b/src/FedoraReview/abstract_bug.py index 651cc45..3b5145f 100644 --- a/src/FedoraReview/abstract_bug.py +++ b/src/FedoraReview/abstract_bug.py @@ -168,7 +168,7 @@ class AbstractBug(HelpersMixin): ''' Extract spec from srpm and update self.spec_url. ''' path = urlparse(self.srpm_url).path name = os.path.basename(path).rsplit('-', 2)[0] - ReviewDirs.workdir_setup(name) + ReviewDirs.workdir_setup(self.get_dirname()) self.do_download_srpm() SRPMFile(self.srpm_file).unpack() @@ -210,12 +210,12 @@ class AbstractBug(HelpersMixin): else: return '?' - def get_dirname(self, prefix=''): + def get_dirname(self, prefix='review-'): ''' Return dirname to be used for this bug. ''' if self.get_name() != '?': return prefix + self.get_name() else: - return prefix + tempfile.mkdtemp(prefix='review-', + return prefix + tempfile.mkdtemp(prefix=prefix, dir=os.getcwd()) @staticmethod