[mock] modify creation of default.cfg link to force creation if the symlink exists but doesn't point to a v
John Clark Williams
jcwillia at fedoraproject.org
Sun Nov 27 23:22:00 UTC 2011
commit 77111000a9f7801fc05126dd1210d5bda4ccddc9
Author: Clark Williams <williams at redhat.com>
Date: Sun Nov 27 17:21:51 2011 -0600
modify creation of default.cfg link to force creation if the
symlink exists but doesn't point to a valid config [BZ# 741145]
remove TZ from default environment [BZ# 754701]
unbuffer output from --chroot command [BZ# 744761]
added -debug stanzas in configs [BZ# 610823]
report package contents of chroot after init [BZ# 736858]
add _umountall() call to clean [BZ# 502922]
updated release checklist overview and 1.1 checklist
add code to tmpfs plugin to try a force umount on umount fail
add 'lazy' option (-l) to umount
prevent exceptions when showing installed packages on EPEL-4
deleted unused (or cannot be used) configs
from Davi Arnaut <davi.arnaut at gmail.com>
set chroot environment variables from config files [BZ# 753179]
.gitignore | 1 +
mock.spec | 155 ++++++++++++++++++++++++++++++------------------------------
sources | 2 +-
3 files changed, 79 insertions(+), 79 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4cb0266..f7d59d2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,4 @@ mock-1.1.4.tar.gz
/mock-1.1.15.tar.gz
/mock-1.1.16.tar.gz
/mock-1.1.17.tar.gz
+/mock-1.1.18.tar.gz
diff --git a/mock.spec b/mock.spec
index 35580d1..90500c2 100644
--- a/mock.spec
+++ b/mock.spec
@@ -1,7 +1,7 @@
# next four lines substituted by autoconf
%define major 1
-%define minor 1
-%define sub 17
+%define minor 0
+%define sub 25
%define extralevel %{nil}
%define release_name mock
%define release_version %{major}.%{minor}.%{sub}%{extralevel}
@@ -18,7 +18,7 @@ Source: https://fedorahosted.org/mock/attachment/wiki/MockTarballs/%{name}-%{ver
URL: http://fedoraproject.org/wiki/Projects/Mock
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
-Requires: python >= 2.6, yum >= 2.4, yum-utils >= 1.1.9, tar, pigz, python-ctypes, python-decoratortools, usermode
+Requires: python >= 2.4, yum >= 2.4, yum-utils >= 1.1.9, tar, pigz, python-ctypes, python-decoratortools, usermode
Requires: createrepo
Requires(pre): shadow-utils
Requires(post): coreutils
@@ -59,11 +59,8 @@ ln -s fedora-rawhide-x86_64.cfg fedora-devel-x86_64.cfg
ln -s fedora-rawhide-ppc.cfg fedora-devel-ppc.cfg
ln -s fedora-rawhide-ppc64.cfg fedora-devel-ppc64.cfg
popd
-echo "%defattr(0644, root, mock)" > %{name}.cfgs
find $RPM_BUILD_ROOT%{_sysconfdir}/mock -name "*.cfg" \
- | sed -e "s|^$RPM_BUILD_ROOT|%%config(noreplace) |" >> %{name}.cfgs
-#cat %{name}.cfgs
-
+ | sed -e "s|^$RPM_BUILD_ROOT|%%config(noreplace) |" > %{name}.cfgs
# just for %%ghosting purposes
ln -s fedora-rawhide-x86_64.cfg $RPM_BUILD_ROOT%{_sysconfdir}/mock/default.cfg
@@ -107,7 +104,6 @@ chmod 2775 /var/cache/mock
%config(noreplace) %{_sysconfdir}/%{name}/*.ini
%config(noreplace) %{_sysconfdir}/pam.d/%{name}
%config(noreplace) %{_sysconfdir}/security/console.apps/%{name}
-%{_sysconfdir}/bash_completion.d
# docs
%{_mandir}/man1/mock.1*
@@ -117,16 +113,32 @@ chmod 2775 /var/cache/mock
%defattr(0775, root, mock, 02775)
%dir /var/cache/mock
%dir /var/lib/mock
-
+
%changelog
-* Mon Oct 31 2011 Clark Williams <williams at redhat.com> - 1.1.17-1
-- fix borken shell argument handling [BZ# 750075]
+* Sun Nov 27 2011 Clark Williams <williams at redhat.com> - 1.0.25-1
+- modify creation of default.cfg link to force creation if the
+ symlink exists but doesn't point to a valid config [BZ# 741145]
+- remove TZ from default environment [BZ# 754701]
+- unbuffer output from --chroot command [BZ# 744761]
+- added -debug stanzas in configs [BZ# 610823]
+- report package contents of chroot after init [BZ# 736858]
+- add _umountall() call to clean [BZ# 502922]
+- updated release checklist overview and 1.1 checklist
+- add code to tmpfs plugin to try a force umount on umount fail
+- add 'lazy' option (-l) to umount
+- prevent exceptions when showing installed packages on EPEL-4
+- deleted unused (or cannot be used) configs
+- from Davi Arnaut <davi.arnaut at gmail.com>
+ - set chroot environment variables from config files [BZ# 753179]
+
+* Mon Oct 31 2011 Clark Williams <williams at redhat.com> - 1.0.24-1
+- fixed shell command handling [BZ# 750075]
- from Marko Myllynen <myllynen at redhat.com>:
- Fix SCM integration on RHEL 5 [BZ# 749518]
-- from Ville Skyttä <ville.skytta at iki.fi>:
+- from Ville Skyttä <ville.skytta at iki.fi>
- bash completion fixes
-* Wed Oct 21 2011 Clark Williams <williams at redhat.com> - 1.1.16-1
+* Fri Oct 14 2011 Clark Williams <williams at redhat.com> - 1.0.23-1
- modified bind_mount and tmpfs plugins to use hooks for shell and chroot
- refactored --shell and --chroot commands [BZ# 619533,728004,745550]
- added input validation for --buildsrpm [BZ# 743173]
@@ -141,18 +153,18 @@ chmod 2775 /var/cache/mock
- From Jan Vcelak <jvcelak at redhat.com>:
- resolve SELinux filesystem mountpoint [BZ# 734781]
-* Fri Sep 23 2011 Clark Williams <williams at redhat.com> - 1.1.15-1
+* Fri Sep 23 2011 Clark Williams <williams at redhat.com> - 1.0.22-1
- Fixed logging issues due to namespace change [BZ# 740232,739550,739972]
- Fixed error removing old RMP db files [BZ# 738052]
- From Yury V. Zaytsev <yury at shurup.com>:
- SELinux plugin uses Python 2.5 syntax [BZ# 740327]
- Fix inconsistent permissions in specfile [BZ# 715286]
-* Fri Sep 9 2011 Clark Williams <williams at redhat.com> - 1.1.14-1
+* Fri Sep 9 2011 Clark Williams <williams at redhat.com> - 1.0.21-1
- From Toshio Ernie Kuratomi <a.badger at gmail.com>
- Fix install path of mockbuild module and default path to module dir
-* Thu Sep 8 2011 Clark Williams <williams at redhat.com> - 1.1.13-1
+* Thu Sep 8 2011 Clark Williams <williams at redhat.com> - 1.0.20-1
- add custom exception for unshare(2) failures
- change getLog().warn to getLog().warning for consistency
- fix namespace collision with python-mock [BZ# 601725]
@@ -163,7 +175,8 @@ chmod 2775 /var/cache/mock
- from Giam Teck Choon <choon at choon.net>
- add support for passing options to yum-buildep via mock cfg
-* Tue Jul 26 2011 Clark Williams <williams at redhat.com> - 1.1.12-1
+* Tue Jul 26 2011 Clark Williams <williams at redhat.com> - 1.0.19-1
+- fixed incorrect python version requirement
- remove f13 configs
- added exception for unshare(2) failures [BZ# 718714]
- added back 'newinstance' mount option to devpts (with symlink logic)
@@ -171,7 +184,7 @@ chmod 2775 /var/cache/mock
- from Matt Domsch <Matt_Domsch at dell.com>
- tmpfs plugin typo fix
-* Wed Jun 22 2011 Clark Williams <williams at redhat.com> - 1.1.11-1
+* Wed Jun 22 2011 Clark Williams <williams at redhat.com> - 1.0.18-1
- remove 'newinstance' mount parameter from devpts filesystem mount (BZ# 711175)
- modify --chroot command to print command output
- update the python requirement to >= 2.6 for 1.1.x mock branch
@@ -182,7 +195,8 @@ chmod 2775 /var/cache/mock
- from Yury V. Zaytsev <yury at shurup.com>
- Fix inconsistent permissions fixing on /var/cache/mock in SPEC template (BZ 715286)
-* Fri May 13 2011 Clark Williams <williams at redhat.com> - 1.1.10-1
+* Fri May 13 2011 Clark Williams <williams at redhat.com> - 1.0.17-1
+- rewrote part of selinux plugin for python 2.4
- raise exception if running mock and user not member of mock group (BZ# 630791)
- call setsid() to kill controlling terminal in chroot (BZ# 672713,501096)
- Went back to creating /dev/tty and /dev/ptmx in all chroots (BZ# 683111)
@@ -205,36 +219,26 @@ chmod 2775 /var/cache/mock
- From Ville Skyttä <ville.skytta at iki.fi>:
- Fixes shell escaping issue by using tuples rather than strings
-* Fri Feb 18 2011 Clark Williams <williams at redhat.com> - 1.1.9-1
-- fix createrepo generated root-owned repository data (BZ# 668278)
+* Sat Feb 19 2011 Clark Williams <williams at redhat.com> - 1.0.16-1
- commented out /dev/tty handling code in backend.py (BZ# 609201)
-- from Ville Skyttä <ville.skytta at iki.fi>
- - Use completion goodies from bash-completion >= 1.2 if available.
- - Add --scm-enable and --scm-option to bash completion.
- - Delete trailing whitespace.
- - Add --install bash completion.
- - Make --enable/disable-plugin completion work again.
+- fix createrepo generated root-owned repository data (BZ# 668278)
- From Jesse Keating <jkeating at redhat.com>
- Make "dist" for rawhide configs be "rawhide" (BZ# 506157)
- - Revert "turn off updates-released repository for fedora-14 configs"
-- From Mike McLean <mikem at redhat.com>
- - fix typo in el4/5 /dev/tty creation (fh ticket #13, mwhiteley)
+- From Ville Skyttä <ville.skytta at iki.fi>
+ - Make --enable/disable-plugin completion work again.
+ - Add --install bash completion.
+ - Delete trailing whitespace.
- From Dennis Gilmore <dennis at ausil.us>
- - Revert "disable the updates repos for F-15 they dont yet exist"
- - sparc64 boxes can build 32 bit sparc stuff
- - add rawhide arm config
- - use the s390 mirrorlists for s390 configs
- - disable the updates repos for F-15 they dont yet exist
- - add the f15 mock configs
-
-* Fri Dec 17 2010 Clark Williams <williams at redhat.com> - 1.1.8-1
+ - add the f15 mock configs
+ - use the s390 mirrorlists for s390 configs
+ - add rawhide arm config
+
+* Thu Jan 6 2011 Clark Williams <williams at redhat.com> - 1.0.15-1
- corrected examples section of the mock.1 man page
- added logging for 'install' and 'update' commadns (BZ# 594477)
- added log file of root cache creation (BZ# 444796)
- added logging to the scrub command
- added unlockBuildRoot() method to clean up build root lockfile
-- added retry logic to mock.util.rmtree
-- removed fedora-12 config files
- From Michael Hampton <error at ioerror.us>:
- Add -f (force) option to userdel when recreating mockbuild user (BZ# 662223)
- From Marko Myllynen <myllynen at redhat.com>:
@@ -243,7 +247,7 @@ chmod 2775 /var/cache/mock
- From Masatake YAMATO <yamato at redhat.com>:
- add runtime location of plugins (BZ# 634224)
-* Mon Dec 13 2010 Clark Williams <williams at redhat.com> - 1.1.7-1
+* Fri Dec 12 2010 Clark Williams <williams at redhat.com> - 1.0.14-1
- add 'legal_host_arches' config option to configs (BZ# 622792)
- add root check and group check (BZ# 662223)
- from Ville Skyttä <ville.skytta at iki.fi>:
@@ -254,7 +258,7 @@ chmod 2775 /var/cache/mock
- Install build deps with yum-builddep
- Add comment why binary packages are built with --nodeps
-* Thu Oct 14 2010 Clark Williams <williams at redhat.com> - 1.1.6-1
+* Thu Oct 14 2010 Clark Williams <williams at redhat.com> - 1.0.13-1
- replace call to perl with native python edit function
- change permissions of selinux plugin 'filesystems' file
- from Ville Skyttä <ville.skytta at iki.fi>:
@@ -267,61 +271,56 @@ chmod 2775 /var/cache/mock
- Fix buildsrpm() docstring
- Error message improvements
-* Fri Sep 17 2010 Clark Williams <williams at redhat.com> - 1.1.5-1
-- fix typo in exception.py
+* Fri Sep 17 2010 Clark Williams <williams at redhat.com> - 1.0.12-1
- add cmpKernelEVR function to compare kernel versions (BZ# 526414)
-- change selinux plugin to use tempfilej
- added commandline argument checking for --buildsrpm (BZ# 605800)
- create empty faillog and lastlog in <chroot>/var/log (BZ# 585973 & 633435)
- changed copyin/copyout prints from debug to info
- from Alan Franzoni <mailing at franzoni.eu>:
- reworked the root object _umountall() method
- fix epel4 chroot cleanup and umountall issue
-- add exception trapping code to _unlock_and_rm_chroot() method
-
-* Mon Aug 09 2010 Clark Williams <williams at redhat.com> - 1.1.4-1
-- pass selinux status to mock.util.rmtree() (BZ# 614440)
-- change integer constants to symbolic errno constants in util.py
-- from Paul Howarth <paul at city-fan.org>
- - update packages after unpacking root cache (BZ# 557526)
- - noarch is always a legal arch (BZ# 622170)
- - exclude bind-mounted cache dirs from root cache
- - retain order of umount commands (BZ# 620825)
- - add i586 as legal build target (BZ# 622544)
-
-* Tue Aug 03 2010 Clark Williams <williams at redhat.com> - 1.1.3-1
-- fix umount ordering problem with selinux plugin (BZ# 620825)
-- setup SELinux state properly (BZ# 620143)
-
-* Fri Jul 30 2010 Clark Williams <williams at redhat.com> - 1.1.2-1
+
+* Sat Aug 14 2010 Clark Williams <williams at redhat.com> - 1.0.11-1
+- fix problem with mock.util.rmtree interaction with selinux plugin
+- change integer constants to symbolic from errno package
+- from Paul Howarth <paul at city-fan.org>:
+ - add i586 as a legal target arch
+ - Retain order of umountCmds
+ - Exclude bind-mounted cache dirs from root cache
+ - noarch is always a legal arch
+ - Update packages after unpacking root cache
+
+* Tue Aug 3 2010 Clark Williams <williams at redhat.com> - 1.0.10-1
+- append rather than insert umount of /proc/filesystems (BZ# 620825)
+- set state correctly for SELinux (BZ# 620143)
+- turn off updates-released repository for prerelease fedora-14 configs
+
+* Sat Jul 31 2010 Clark Williams <williams at redhat.com> - 1.0.9-1
- From Jan Vcelak <jvcelak at redhat.com>:
- - added selinux plugin
+ - added an selinux plugin
- From Kalev Lember <kalev at smartlink.ee>:
- - added max_fs_size parameter for tmpfs plugin
+ - patch to tmpfs plugin to allow specifying max fs size
- From Ricky Zhou <rzhou at redhat.com>:
- allow --sources to specify either single file or directory (BZ# 510409)
- From Dennis Gilmore <dennis at ausil.us>:
- - update the epel-6 mock configs to point at the beta2 mirrorlist urls
-- From Paul B. Schroeder <paulbsch at haywired.net>:
+ - updated epel-6 config files
+- From Paul B. Schroeder <paulbsch at haywired.net>:
- add the --scrub option for cleaning up cache (BZ# 450726)
-- added f14 configs
- added symlink from /proc/self/fd to /dev/fd in the chroot (BZ# 526414)
+- changed from referencing defaults.cfs to site-defaults.cfg (BZ# 600487)
- added i686 architecture
+- deleted f10 and f11 configs
+- fixed cachefile filtering logic
+- moved rpmdb clean block of code to work with --offline option
- added logic to detect invalid architecture combinations (BZ# 607144)
- added description of how to add user to the mock group (BZ# 570434)
-- deleted fedora-10 and fedora-11 configs
-- moved rpmdb clean block so that it works with --offline
-- changed from referencing defaults.cfs to site-defaults.cfg (BZ# 600487)
-- fix cachefile generation filtering logic
-- filter out proc,sys,and dev from cache file creation
-* Fri May 14 2010 Clark Williams <williams at redhat.com> - 1.1.1-1
-- patch from Seth Vidal <skvidal at fedoraproject.org> to handle
- rpmdb cache issue (BZ#591741)
+* Fri Apr 14 2010 Clark Williams <williams at redhat.com> - 1.0.8-1
+- rpmdb cache fix from Seth Vidal <skvidal at fedoraproject.org>
-* Thu Mar 11 2010 Jesse Keating <jkeating at redhat.com> - 1.1.0-1
-- Make the createrepo command arguments optional
-- Make the createrepo call disabled by default
+* Thu Mar 11 2010 Jesse Keating <jkeating at redhat.com> - 1.0.7-1
+- Revert new createrepo feature
+- Revert -n/-N useradd change, just use -n as it still works
* Fri Feb 19 2010 Clark Williams <williams at redhat.com>- 1.0.6-1
- added code to check for SELinux being enabled or disabled
diff --git a/sources b/sources
index 8f4d258..8a9a382 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1922940834dd739c11ff12bec475b508 mock-1.1.17.tar.gz
+a61865ea3b068595188ea3d6ea5ffe2a mock-1.1.18.tar.gz
More information about the scm-commits
mailing list