Merge branch 'devel'

xsuchy · xsuchy · commit 82664f7ef76b · 2015-09-16T14:11:56.000+02:00
diff --git a/docs/mock.1 b/docs/mock.1
@@ -151,7 +151,7 @@ package and branch can be defined with \fB\-\-scm\-option\fP arguments,
 see site\-defaults.cfg for more information.
 .TP
 \fB\-\-scrub\fR=\fITYPE\fP
-Completely remove the specified chroot or cache dir or all of the chroot and cache.  \fITYPE\fR is one of all, chroot, cache, root\-cache, c\-cache, or yum\-cache.
+Completely remove the specified chroot or cache dir or all of the chroot and cache.  \fITYPE\fR is one of all, chroot, cache, root\-cache, c\-cache, yum\-cache or dnf\-cache. In fact, dnf\-cache is just alias for yum\-cache and both removes Dnf and Yum cache.
 .TP
 \fB\-\-shell\fP [\fICOMMAND [\fIARGS...]\fR]
 Run the specified command interactively within the chroot (no 'clean' is performed). If no command specified, /bin/sh is run. Note that COMMAND is shell expanded using shell in chroot.
diff --git a/docs/release-instructions.txt b/docs/release-instructions.txt
@@ -4,7 +4,8 @@ A note on mock versions:
 
   There are now two main branches to be aware of:
   	- mock-1.0 (pre-F13 and EPEL5)
-	- mock-1.1+ (F-13+ and EPEL6+)
+	- master (for releasing F-13+ and EPEL6+)
+    - devel (for development of future versions)
   In the upstream git tree, mock-1.0 is tracked on the branch origin/mock-1.0,
   while mock-1.1+ is in the master branch. Please be careful when
   updating the various distro to use the correct branch and version
@@ -57,7 +58,7 @@ In the upstream git tree:
    2) create a branch from master (e.g. 'prerelease') and switch to it
       $ git checkout -b work master
    3) merge any remote updates for specific fixes
-      $ git merge jkeating/updates-for-clark
+      $ git merge origin/devel
    4) merge any local branch work and reolve any conflicts
       $ git merge frooble-changes
    5) update configure.ac with new version info (don't commit yet)
@@ -88,6 +89,9 @@ In the upstream git tree:
      $ git push origin tag mock-<version>
   19) copy tarball to fedorahosted:
      $ scp mock-<version>.tar.gz fedorahosted.org:mock
+  20) merge changes back to devel branch
+     $ git checkout devel
+     $ git merge origin/master
 
 
 In the fedora git (koji) tree
diff --git a/etc/bash_completion.d/mock b/etc/bash_completion.d/mock
@@ -72,7 +72,7 @@ _mock()
             ;;
         --scrub)
             COMPREPLY=( $( compgen -W "all chroot cache root-cache c-cache
-                yum-cache lvm" -- "$cur" ) )
+                yum-cache dnf-cache lvm" -- "$cur" ) )
             return 0
             ;;
         -i|--install|install)
diff --git a/etc/mock/fedora-23-aarch64.cfg b/etc/mock/fedora-23-aarch64.cfg
@@ -5,7 +5,6 @@ config_opts['chroot_setup_cmd'] = 'install @buildsys-build'
 config_opts['dist'] = 'fc23'  # only useful for --resultdir variable subst
 config_opts['extra_chroot_dirs'] = [ '/run/lock', ]
 config_opts['releasever'] = '23'
-config_opts['package_manager'] = 'dnf'
 
 config_opts['yum.conf'] = """
 [main]
@@ -19,6 +18,8 @@ gpgcheck=0
 assumeyes=1
 syslog_ident=mock
 syslog_device=
+install_weak_deps=0
+metadata_expire=0
 
 # repos
 
diff --git a/etc/mock/fedora-23-armhfp.cfg b/etc/mock/fedora-23-armhfp.cfg
@@ -5,7 +5,6 @@ config_opts['chroot_setup_cmd'] = 'install @buildsys-build'
 config_opts['dist'] = 'fc23'  # only useful for --resultdir variable subst
 config_opts['extra_chroot_dirs'] = [ '/run/lock', ]
 config_opts['releasever'] = '23'
-config_opts['package_manager'] = 'dnf'
 
 config_opts['yum.conf'] = """
 [main]
@@ -19,6 +18,8 @@ gpgcheck=0
 assumeyes=1
 syslog_ident=mock
 syslog_device=
+install_weak_deps=0
+metadata_expire=0
 
 # repos
 
diff --git a/etc/mock/fedora-23-i386.cfg b/etc/mock/fedora-23-i386.cfg
@@ -5,7 +5,6 @@ config_opts['chroot_setup_cmd'] = 'install @buildsys-build'
 config_opts['dist'] = 'fc23'  # only useful for --resultdir variable subst
 config_opts['extra_chroot_dirs'] = [ '/run/lock', ]
 config_opts['releasever'] = '23'
-config_opts['package_manager'] = 'dnf'
 
 config_opts['yum.conf'] = """
 [main]
@@ -19,6 +18,8 @@ gpgcheck=0
 assumeyes=1
 syslog_ident=mock
 syslog_device=
+install_weak_deps=0
+metadata_expire=0
 
 # repos
 
diff --git a/etc/mock/fedora-23-ppc64.cfg b/etc/mock/fedora-23-ppc64.cfg
@@ -5,7 +5,6 @@ config_opts['chroot_setup_cmd'] = 'install @buildsys-build'
 config_opts['dist'] = 'fc23'  # only useful for --resultdir variable subst
 config_opts['extra_chroot_dirs'] = [ '/run/lock', ]
 config_opts['releasever'] = '23'
-config_opts['package_manager'] = 'dnf'
 
 config_opts['yum.conf'] = """
 [main]
@@ -19,6 +18,8 @@ gpgcheck=0
 assumeyes=1
 syslog_ident=mock
 syslog_device=
+install_weak_deps=0
+metadata_expire=0
 
 # repos
 
diff --git a/etc/mock/fedora-23-ppc64le.cfg b/etc/mock/fedora-23-ppc64le.cfg
@@ -5,7 +5,6 @@ config_opts['chroot_setup_cmd'] = 'install @buildsys-build'
 config_opts['dist'] = 'fc23'  # only useful for --resultdir variable subst
 config_opts['extra_chroot_dirs'] = [ '/run/lock', ]
 config_opts['releasever'] = '23'
-config_opts['package_manager'] = 'dnf'
 
 config_opts['yum.conf'] = """
 [main]
@@ -19,6 +18,8 @@ gpgcheck=0
 assumeyes=1
 syslog_ident=mock
 syslog_device=
+install_weak_deps=0
+metadata_expire=0
 
 # repos
 
diff --git a/etc/mock/fedora-23-s390.cfg b/etc/mock/fedora-23-s390.cfg
@@ -5,7 +5,6 @@ config_opts['chroot_setup_cmd'] = 'install @buildsys-build'
 config_opts['dist'] = 'fc23'  # only useful for --resultdir variable subst
 config_opts['extra_chroot_dirs'] = [ '/run/lock', ]
 config_opts['releasever'] = '23'
-config_opts['package_manager'] = 'dnf'
 
 config_opts['yum.conf'] = """
 [main]
@@ -19,6 +18,8 @@ gpgcheck=0
 assumeyes=1
 syslog_ident=mock
 syslog_device=
+install_weak_deps=0
+metadata_expire=0
 
 # repos
 
diff --git a/etc/mock/fedora-23-s390x.cfg b/etc/mock/fedora-23-s390x.cfg
@@ -5,7 +5,6 @@ config_opts['chroot_setup_cmd'] = 'install @buildsys-build'
 config_opts['dist'] = 'fc23'  # only useful for --resultdir variable subst
 config_opts['extra_chroot_dirs'] = [ '/run/lock', ]
 config_opts['releasever'] = '23'
-config_opts['package_manager'] = 'dnf'
 
 config_opts['yum.conf'] = """
 [main]
@@ -19,6 +18,8 @@ gpgcheck=0
 assumeyes=1
 syslog_ident=mock
 syslog_device=
+install_weak_deps=0
+metadata_expire=0
 
 # repos
 
diff --git a/etc/mock/fedora-23-x86_64.cfg b/etc/mock/fedora-23-x86_64.cfg
@@ -5,7 +5,6 @@ config_opts['chroot_setup_cmd'] = 'install @buildsys-build'
 config_opts['dist'] = 'fc23'  # only useful for --resultdir variable subst
 config_opts['extra_chroot_dirs'] = [ '/run/lock', ]
 config_opts['releasever'] = '23'
-config_opts['package_manager'] = 'dnf'
 
 config_opts['yum.conf'] = """
 [main]
@@ -19,6 +18,8 @@ gpgcheck=0
 assumeyes=1
 syslog_ident=mock
 syslog_device=
+install_weak_deps=0
+metadata_expire=0
 
 # repos
 
diff --git a/etc/mock/fedora-rawhide-aarch64.cfg b/etc/mock/fedora-rawhide-aarch64.cfg
@@ -20,6 +20,8 @@ gpgcheck=0
 assumeyes=1
 syslog_ident=mock
 syslog_device=
+install_weak_deps=0
+metadata_expire=0
 
 # repos
 
diff --git a/etc/mock/fedora-rawhide-armhfp.cfg b/etc/mock/fedora-rawhide-armhfp.cfg
@@ -20,6 +20,8 @@ gpgcheck=0
 assumeyes=1
 syslog_ident=mock
 syslog_device=
+install_weak_deps=0
+metadata_expire=0
 
 # repos
 
diff --git a/etc/mock/fedora-rawhide-i386.cfg b/etc/mock/fedora-rawhide-i386.cfg
@@ -20,6 +20,8 @@ gpgcheck=0
 assumeyes=1
 syslog_ident=mock
 syslog_device=
+install_weak_deps=0
+metadata_expire=0
 
 # repos
 
diff --git a/etc/mock/fedora-rawhide-ppc64.cfg b/etc/mock/fedora-rawhide-ppc64.cfg
@@ -20,6 +20,8 @@ gpgcheck=0
 assumeyes=1
 syslog_ident=mock
 syslog_device=
+install_weak_deps=0
+metadata_expire=0
 
 # repos
 
diff --git a/etc/mock/fedora-rawhide-ppc64le.cfg b/etc/mock/fedora-rawhide-ppc64le.cfg
@@ -20,6 +20,8 @@ gpgcheck=0
 assumeyes=1
 syslog_ident=mock
 syslog_device=
+install_weak_deps=0
+metadata_expire=0
 
 # repos
 
diff --git a/etc/mock/fedora-rawhide-s390.cfg b/etc/mock/fedora-rawhide-s390.cfg
@@ -20,6 +20,8 @@ gpgcheck=0
 assumeyes=1
 syslog_ident=mock
 syslog_device=
+install_weak_deps=0
+metadata_expire=0
 
 # repos
 
diff --git a/etc/mock/fedora-rawhide-s390x.cfg b/etc/mock/fedora-rawhide-s390x.cfg
@@ -20,6 +20,8 @@ gpgcheck=0
 assumeyes=1
 syslog_ident=mock
 syslog_device=
+install_weak_deps=0
+metadata_expire=0
 
 # repos
 
diff --git a/etc/mock/fedora-rawhide-sparc.cfg b/etc/mock/fedora-rawhide-sparc.cfg
@@ -20,6 +20,8 @@ gpgcheck=0
 assumeyes=1
 syslog_ident=mock
 syslog_device=
+install_weak_deps=0
+metadata_expire=0
 #exclude=*.sparc64
 # The above is not needed anymore with yum multilib policy of "best" which is the default in Fedora.
 
diff --git a/etc/mock/fedora-rawhide-x86_64.cfg b/etc/mock/fedora-rawhide-x86_64.cfg
@@ -20,6 +20,8 @@ gpgcheck=0
 assumeyes=1
 syslog_ident=mock
 syslog_device=
+install_weak_deps=0
+metadata_expire=0
 
 # repos
 
diff --git a/etc/mock/site-defaults.cfg b/etc/mock/site-defaults.cfg
@@ -54,6 +54,9 @@
 # By default Mock use simple chroot(1). When you set this to True
 # it will use systemd-nspawn(1)
 # config_opts['use_nspawn'] = False
+# If you're using nspawn, then by default networking will be turned off
+# for rpmbuild.  This helps ensure more reproducible builds.
+# config_opts['rpmbuild_networking'] = False
 
 # The default package manager is Yum
 # config_opts['package_manager'] = 'yum'
@@ -245,6 +248,10 @@
 # config_opts['dnf.conf'] = ''
 # Important! You must use 'assumeyes=1' in yum/dnf.conf otherwise Mock will fail.
 #
+# Flip this if you want to get rid of warning message on systems which does not support DNF
+# Warning! Setting this to False will automatically use Yum on RHEL{6,7} platforms.
+# config_opts['dnf_warning'] = True
+#
 # CAN SET, defaults usually work ok:
 # config_opts['chroot_setup_cmd'] = 'install buildsys-build'
 # config_opts['log_config_file'] = 'logging.ini'
diff --git a/py/mock.py b/py/mock.py
@@ -21,7 +21,7 @@
 from __future__ import print_function
 """
     usage:
-           mock [options] {--init|--clean|--scrub=[all,chroot,cache,root-cache,c-cache,yum-cache,lvm]}
+           mock [options] {--init|--clean|--scrub=[all,chroot,cache,root-cache,c-cache,yum-cache,dnf-cache,lvm]}
            mock [options] [--rebuild] /path/to/srpm(s)
            mock [options] --buildsrpm {--spec /path/to/spec --sources /path/to/src|--scm-enable [--scm-option key=value]}
            mock [options] {--shell|--chroot} <cmd>
@@ -117,8 +117,8 @@ def command_parse():
     parser.add_option("--clean", action="store_const", const="clean",
                       dest="mode",
                       help="completely remove the specified chroot")
-    scrub_choices = ('chroot', 'cache', 'root-cache', 'c-cache', 'yum-cache', 'lvm', 'all')
-    scrub_metavar = "[all|chroot|cache|root-cache|c-cache|yum-cache]"
+    scrub_choices = ('chroot', 'cache', 'root-cache', 'c-cache', 'yum-cache', 'dnf-cache', 'lvm', 'all')
+    scrub_metavar = "[all|chroot|cache|root-cache|c-cache|yum-cache|dnf-cache]"
     parser.add_option("--scrub", action="callback", type="choice", default=[],
                       choices=scrub_choices, metavar=scrub_metavar,
                       callback=scrub_callback,
@@ -659,7 +659,7 @@ def run_command(options, args, config_opts, commands, buildroot, state):
             import mockbuild.scm
         except ImportError as e:
             raise mockbuild.exception.BadCmdline(
-                "Mock SCM module not installed: %s" % e)
+                "Mock SCM module not installed: %s. You should install package mock-scm." % e)
         scmWorker = mockbuild.scm.scmWorker(log, config_opts['scm_opts'], config_opts['macros'])
         buildroot.uid_manager.dropPrivsTemp()
         scmWorker.get_sources()
@@ -750,13 +750,14 @@ def run_command(options, args, config_opts, commands, buildroot, state):
                 sys.exit(50)
             log.info("copying %s to %s" % (src, dest))
             if os.path.isdir(src):
-                if os.path.exists(dest):
+                dest2 = dest
+                if os.path.exists(dest2):
                     path_suffix = os.path.split(src)[1]
-                    dest = os.path.join(dest, path_suffix)
-                    if os.path.exists(dest):
-                        log.critical("Destination %{0} already exist!".format(dest))
+                    dest2 = os.path.join(dest2, path_suffix)
+                    if os.path.exists(dest2):
+                        log.critical("Destination %{0} already exist!".format(dest2))
                         sys.exit(50)
-                shutil.copytree(src, dest)
+                shutil.copytree(src, dest2)
             else:
                 shutil.copy(src, dest)
         buildroot.chown_home_dir()
diff --git a/py/mockbuild/backend.py b/py/mockbuild/backend.py
@@ -99,8 +99,8 @@ def scrub(self, scrub_opts):
                     elif scrub == 'root-cache':
                         self.buildroot.root_log.info("scrubbing root-cache for %s" % self.config_name)
                         util.rmtree(os.path.join(self.buildroot.cachedir, 'root_cache'), selinux=self.buildroot.selinux)
-                    elif scrub == 'yum-cache':
-                        self.buildroot.root_log.info("scrubbing yum-cache for %s" % self.config_name)
+                    elif scrub == 'yum-cache' or scrub == 'dnf-cache':
+                        self.buildroot.root_log.info("scrubbing yum-cache and dnf-cache for %s" % self.config_name)
                         util.rmtree(os.path.join(self.buildroot.cachedir, 'yum_cache'), selinux=self.buildroot.selinux)
                         util.rmtree(os.path.join(self.buildroot.cachedir, 'dnf_cache'), selinux=self.buildroot.selinux)
             except IOError as e:
@@ -193,14 +193,14 @@ def build(self, srpm, timeout, check=True):
 
         buildstate = "build phase for %s" % baserpm
         self.state.start(buildstate)
+        # remove rpm db files to prevent version mismatch problems
+        # note: moved to do this before the user change below!
+        self.buildroot._nuke_rpm_db()
+        dropped_privs = False
         try:
-            # remove rpm db files to prevent version mismatch problems
-            # note: moved to do this before the user change below!
-            self.buildroot._nuke_rpm_db()
-
             if not util.USE_NSPAWN:
-                # drop privs and become mock user
                 self.uid_manager.becomeUser(self.buildroot.chrootuid, self.buildroot.chrootgid)
+                dropped_privs = True
             buildsetup = "build setup for %s" % baserpm
             self.state.start(buildsetup)
 
@@ -222,6 +222,12 @@ def build(self, srpm, timeout, check=True):
             self.plugins.call_hooks('prebuild')
 
             results = self.rebuild_package(spec_path, timeout, check)
+            # In the nspawn case, we retained root until here, but we
+            # need to ensure our output files are owned by the caller's uid.
+            # So drop them now.
+            if not dropped_privs:
+                self.uid_manager.becomeUser(self.buildroot.chrootuid, self.buildroot.chrootgid)
+                dropped_privs = True
             if results:
                 self.build_results.extend(self.copy_build_results(results))
             elif self.config.get('short_circuit'):
@@ -233,7 +239,7 @@ def build(self, srpm, timeout, check=True):
             self.state.finish(rpmbuildstate)
 
         finally:
-            if not util.USE_NSPAWN:
+            if dropped_privs:
                 self.uid_manager.restorePrivs()
             if self.state.result != 'success':
                 self.state.result = 'fail'
@@ -432,6 +438,7 @@ def rebuild_package(self, spec_path, timeout, check):
             shell=False, logger=self.buildroot.build_log, timeout=timeout,
             uid=self.buildroot.chrootuid, gid=self.buildroot.chrootgid,
             user=self.buildroot.chrootuser,
+            private_network=not self.config['rpmbuild_networking'],
             printOutput=self.config['print_main_output'])
         bd_out = self.make_chroot_path(self.buildroot.builddir)
         results = glob.glob(bd_out + '/RPMS/*.rpm')
diff --git a/py/mockbuild/buildroot.py b/py/mockbuild/buildroot.py
diff --git a/py/mockbuild/package_manager.py b/py/mockbuild/package_manager.py
diff --git a/py/mockbuild/plugins/package_state.py b/py/mockbuild/plugins/package_state.py
diff --git a/py/mockbuild/uid.py b/py/mockbuild/uid.py
diff --git a/py/mockbuild/util.py b/py/mockbuild/util.py
diff --git a/py/mockchain.py b/py/mockchain.py
