diff options
author | Clark Williams <williams@redhat.com> | 2007-12-14 16:34:49 -0600 |
---|---|---|
committer | Clark Williams <williams@redhat.com> | 2007-12-14 16:34:49 -0600 |
commit | 64439e769bb95ff4e277deb86b1743a582dee50d (patch) | |
tree | 12452047547da49d5148fdd5debffbe0bbda722c | |
parent | 39ee6e19397207468751d6308e0a7895543d9733 (diff) | |
parent | 184afb1852bccc8e9d1b38dea05f30af1180f122 (diff) | |
download | mock-64439e769bb95ff4e277deb86b1743a582dee50d.tar.gz mock-64439e769bb95ff4e277deb86b1743a582dee50d.tar.xz mock-64439e769bb95ff4e277deb86b1743a582dee50d.zip |
resolved merge conflicts
-rw-r--r-- | docs/release-instructions.txt | 14 | ||||
-rw-r--r-- | py/mock/plugins/root_cache.py | 2 |
2 files changed, 14 insertions, 2 deletions
diff --git a/docs/release-instructions.txt b/docs/release-instructions.txt index 9cc1288..8b1cc20 100644 --- a/docs/release-instructions.txt +++ b/docs/release-instructions.txt @@ -1,8 +1,20 @@ Release checklist overview: + -) ensure all source changes are checked into git + -) run 'make distclean' to remove generated files + -) remove ChangeLog and AUTHORS + -) update version info in 'configure.ac' + -) run 'autogen.sh' to update autoconf files + -) run 'configure' to generate Makefile and mock.spec + -) run 'make dist' to generate ChangeLog and AUTHORS files + -) run make rpm to generate binary RPM and propagate version changes + 1) update both the ChangeLog file and the specfile %changelog section + - remove existing ChangeLog and AUTHORS file + - run 'make dist' to regenerate them + - edit mock.spec.in with %changelog info 2) update version in 'configure.ac' - 3) run 'autoreconf' to update autoconf files + 3) run 'autogen.sh' to update autoconf files 4) run 'make rpm' to update version in all files 5) check all changes into git and push upstream 6) properly tag git tree with signature diff --git a/py/mock/plugins/root_cache.py b/py/mock/plugins/root_cache.py index 81f7c5f..6e9c60e 100644 --- a/py/mock/plugins/root_cache.py +++ b/py/mock/plugins/root_cache.py @@ -74,7 +74,7 @@ class RootCache(object): if os.path.exists(self.rootCacheFile) and self.rootObj.chrootWasCleaned: self.state("unpacking cache") self._rootCacheLock() - mock.util.do("tar xzf %s -C %s" % (self.rootCacheFile, rootObj.makeChrootPath())) + mock.util.do("tar xzf %s -C %s" % (self.rootCacheFile, self.rootObj.makeChrootPath())) self._rootCacheUnlock() self.chroot_setup_cmd = "update" self.rootObj.chrootWasCleaned = False |