summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlav Vitters <olav@vitters.nl>2014-07-06 14:20:45 +0200
committerOlav Vitters <olav@vitters.nl>2014-07-06 14:20:45 +0200
commit7a6eb0514640f4174fc4cbeca00f950d98e9df78 (patch)
tree30cd4900891d13f4c00523829cc4d02fcf7770af
parent7b51a695ac6d0d66d1f19d98f72671fc3a69e9c7 (diff)
downloadmgagnome-7a6eb0514640f4174fc4cbeca00f950d98e9df78.tar
mgagnome-7a6eb0514640f4174fc4cbeca00f950d98e9df78.tar.gz
mgagnome-7a6eb0514640f4174fc4cbeca00f950d98e9df78.tar.bz2
mgagnome-7a6eb0514640f4174fc4cbeca00f950d98e9df78.tar.xz
mgagnome-7a6eb0514640f4174fc4cbeca00f950d98e9df78.zip
add another way to remove the buildroot
-rwxr-xr-xmgagnome2
1 files changed, 1 insertions, 1 deletions
diff --git a/mgagnome b/mgagnome
index 8c8e948..7508427 100755
--- a/mgagnome
+++ b/mgagnome
@@ -381,7 +381,7 @@ class SpecFile(object):
return self._sources_and_patches(flag=1)
def clean_spec(self):
- re_rm_buildroot = r'^(?:rm|\%\{__rm\}) *(?:-rf|-rf|-r) *(?:\%buildroot|\%\{buildroot\}|\$RPM_BUILDROOT|\$RPM_BUILD_ROOT) *\n'
+ re_rm_buildroot = r'^(?:rm|\%\{__rm\}) *(?:-rf|-rf|-r) *(?:\%buildroot|\%\{buildroot\}|\$RPM_BUILDROOT|\$RPM_BUILD_ROOT|\$\{RPM_BUILD_ROOT\}) *\n'
re_clean_spec = [
# remove %defattr
('remove defattr', re.compile(r'(?P<keeppre>^\%files[^\n]*\n)^\%defattr\s*\(-, *root, *root(?:, *-)?\)\s*\n', re.MULTILINE + re.IGNORECASE)),