Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
  • Loading branch information
remicollet committed Apr 30, 2011
1 parent ff13558 commit fff7210
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 1 deletion.
11 changes: 11 additions & 0 deletions mock/mock.patch
Expand Up @@ -50,3 +50,14 @@ diff -up mock-1.1.9/py/mock/util.py.orig mock-1.1.9/py/mock/util.py
+ directory = os.path.realpath(directory)
+
+ return os.path.commonprefix([path, directory]) == directory
--- mock-1.1.9/py/mock/plugins/ccache.py.orig 2011-04-30 11:23:04.167083378 +0200
+++ mock-1.1.9/py/mock/plugins/ccache.py 2011-04-30 11:26:58.778589188 +0200
@@ -50,6 +50,8 @@
def _ccachePreInitHook(self):
getLog().info("enabled ccache")
mock.util.mkdirIfAbsent(self.rootObj.makeChrootPath('/tmp/ccache'))
+ self.rootObj.uidManager.dropPrivsTemp()
mock.util.mkdirIfAbsent(self.ccachePath)
+ self.rootObj.uidManager.restorePrivs()
os.environ['CCACHE_DIR'] = "/tmp/ccache"
os.environ['CCACHE_UMASK'] = "002"
8 changes: 7 additions & 1 deletion mock/mock.spec
Expand Up @@ -11,7 +11,7 @@
Summary: Builds packages inside chroots
Name: mock
Version: %{release_version}
Release: 1%{?dist}
Release: 1%{?dist}.2
License: GPLv2+
Group: Development/Tools
Source: https://fedorahosted.org/mock/attachment/wiki/MockTarballs/%{name}-%{version}.tar.gz
Expand Down Expand Up @@ -122,6 +122,12 @@ fi
%attr(02775, root, mock) %dir /var/cache/mock

%changelog
* Sat Apr 30 2011 Remi Collet <rpms@famillecollet.com> 1.1.9-1.2
- Fix previous patch and dump release

* Sat Apr 30 2011 Remi Collet <rpms@famillecollet.com> 1.1.9-1.1
- Fix #700983 ccache dir owned by root

* Thu Apr 21 2011 Remi Collet <rpms@famillecollet.com> 1.1.9-1
- Fix #688222 cleanup_on_success from config not honored

Expand Down

0 comments on commit fff7210

Please sign in to comment.