Rhel7 rebase otherbugs

.gitignore

@@ -36,7 +36,6 @@ configure
 data/liveinst/gnome/fedora-welcome.desktop
 depcomp
 dirbrowser
-gtk-doc.m4
 install-sh
 keymaps-override-*
 libtool

Makefile.am

@@ -49,7 +49,7 @@ ZANATA_PUSH_ARGS = --srcdir $(srcdir)/po/ --push-type source --force
 
 INSTALLATION_GUIDE_REPO_URL = git://git.fedorahosted.org/git/docs/install-guide.git
 RC_RELEASE ?= $(shell date -u +0.1.%Y%m%d%H%M%S)
-MOCKCHROOT ?= fedora-21-x86_64
+MOCKCHROOT ?= rhel-7.2-candidate-x86_64
 
 tag:
 	@git tag -s -a -m "Tag as $(ARCHIVE_TAG)" $(ARCHIVE_TAG)
@@ -94,10 +94,9 @@ api:
 	doxygen docs/api.cfg
 
 rc-release: scratch-bumpver scratch
-	mock -r $(MOCKCHROOT) --buildsrpm  --spec ./$(PACKAGE_NAME).spec --sources . || exit 1
-	cp /var/lib/mock/$(MOCKCHROOT)/result/*src.rpm . || exit 1
-	mock -r $(MOCKCHROOT) --rebuild *src.rpm || exit 1
-	cp /var/lib/mock/$(MOCKCHROOT)/result/*.rpm . || exit 1
+	mock -r $(MOCKCHROOT) --scrub all || exit 1
+	mock -r $(MOCKCHROOT) --buildsrpm  --spec ./$(PACKAGE_NAME).spec --sources . --resultdir $(PWD) || exit 1
+	mock -r $(MOCKCHROOT) --rebuild *src.rpm --resultdir $(PWD) || exit 1
 
 bumpver: po-pull
 	@opts="-n $(PACKAGE_NAME) -v $(PACKAGE_VERSION) -r $(PACKAGE_RELEASE) -b $(PACKAGE_BUGREPORT)" ; \

anaconda

@@ -519,8 +519,6 @@ def parseArguments(argv=None, boot_cmdline=None):
                     help=help_parser.help_text("extlinux"))
     ap.add_argument("--nombr", action="store_true", default=False,
                     help=help_parser.help_text("nombr"))
-    ap.add_argument("--dnf", action="store_true", default=False,
-                    help=help_parser.help_text("dnf"))
     ap.add_argument("--mpathfriendlynames", action="store_true", default=True,
                     help=help_parser.help_text("mpathfriendlynames"))
 
@@ -1086,7 +1084,6 @@ if __name__ == "__main__":
     flags.armPlatform = opts.armPlatform
     flags.extlinux = opts.extlinux
     flags.nombr = opts.nombr
-    flags.dnf = opts.dnf
     flags.mpathFriendlyNames = opts.mpathfriendlynames
     flags.debug = opts.debug
     flags.askmethod = opts.askmethod

anaconda.spec.in

@@ -21,7 +21,6 @@ Source0: %{name}-%{version}.tar.bz2
 %define intltoolver 0.31.2-3
 %define pykickstartver 1.99.66.2
 %define yumver 3.4.3-91
-%define dnfver 0.4.18
 %define partedver 1.8.1
 %define pypartedver 2.5-2
 %define pythonpyblockver 0.45
@@ -33,7 +32,7 @@ Source0: %{name}-%{version}.tar.bz2
 %define firewalldver 0.3.5-1
 %define pythonurlgrabberver 3.9.1-5
 %define utillinuxver 2.15.1
-%define dracutver 034-7
+%define dracutver 033-240
 %define isomd5sum 1.0.10
 %define fcoeutilsver 1.0.12-3.20100323git
 %define iscsiver 6.2.0.870-3
@@ -88,7 +87,6 @@ The anaconda package is a metapackage for the Anaconda installer.
 
 %package core
 Summary: Core of the Anaconda installer
-Requires: dnf >= %{dnfver}
 Requires: python-blivet >= 1:0.61.15.2
 Requires: python-meh >= %{mehver}
 Requires: libreport-anaconda >= 2.0.21-1
@@ -120,7 +118,7 @@ Requires: openssh
 %endif
 Requires: isomd5sum >= %{isomd5sum}
 Requires: yum-utils >= %{yumutilsver}
-Requires: createrepo_c
+Requires: createrepo
 Requires: NetworkManager >= %{nmver}
 Requires: NetworkManager-team
 Requires: dhclient

data/anaconda_options.txt

@@ -223,11 +223,6 @@ installed OS will be booted.  /etc/grub.d/40_custom can be used with
 manually created menuentrys which can use configfile to point to the
 grub.cfg on the newly installed OS.
 
-dnf
-Use the experimental DNF package management backend instead of the YUM backend
-that is used by default. For more information about the DNF project see:
-http://dnf.baseurl.org
-
 mpathfriendlynames
 Tell multipathd to use user friendly names when naming devices during the installation.
 See the multipathd documentation for more info.

data/post-scripts/99-copy-logs.ks

@@ -2,7 +2,7 @@
 %post --nochroot
 
 mkdir -p $ANA_INSTALL_PATH/var/log/anaconda
-for log in anaconda.log syslog X.log program.log packaging.log storage.log ifcfg.log yum.log dnf.log dnf.rpm.log; do
+for log in anaconda.log syslog X.log program.log packaging.log storage.log ifcfg.log yum.log; do
     [ -e /tmp/$log ] && cp /tmp/$log $ANA_INSTALL_PATH/var/log/anaconda/
 done
 cp /tmp/ks-script*.log $ANA_INSTALL_PATH/var/log/anaconda/

po/POTFILES.in

@@ -28,7 +28,6 @@ pyanaconda/packaging/__init__.py
 pyanaconda/packaging/livepayload.py
 pyanaconda/packaging/tarpayload.py
 pyanaconda/packaging/yumpayload.py
-pyanaconda/packaging/dnfpayload.py
 pyanaconda/packaging/rpmostreepayload.py
 
 # Interfaces

pyanaconda/anaconda.py

@@ -130,12 +130,6 @@ def payload(self):
                 elif self.ksdata.method.method == "liveimg":
                     from pyanaconda.packaging.livepayload import LiveImageKSPayload
                     klass = LiveImageKSPayload
-                elif flags.dnf:
-                    try:
-                        from pyanaconda.packaging.dnfpayload import DNFPayload
-                        klass = DNFPayload
-                    except ImportError:
-                        log.critical('Importing DNF  failed.', exc_info=True)
                 else:
                     from pyanaconda.packaging.yumpayload import YumPayload
                     klass = YumPayload

pyanaconda/exception.py

@@ -223,7 +223,6 @@ def runDebug(self, exc_info):
 def initExceptionHandling(anaconda):
     fileList = [ "/tmp/anaconda.log", "/tmp/packaging.log",
                  "/tmp/program.log", "/tmp/storage.log", "/tmp/ifcfg.log",
-                 "/tmp/dnf.log", "/tmp/dnf.rpm.log",
                  "/tmp/yum.log", iutil.getSysroot() + "/root/install.log",
                  "/proc/cmdline" ]
 

pyanaconda/flags.py

@@ -65,7 +65,6 @@ def __init__(self, read_cmdline=True):
         self.gpt = False
         self.leavebootorder = False
         self.testing = False
-        self.dnf = False
         self.mpathFriendlyNames = True
         # ksprompt is whether or not to prompt for missing ksdata
         self.ksprompt = True
@@ -79,7 +78,7 @@ def __init__(self, read_cmdline=True):
 
     def read_cmdline(self):
         for f in ("selinux", "debug", "leavebootorder", "testing", "extlinux",
-                  "nombr", "gpt", "dnf"):
+                  "nombr", "gpt"):
             self.set_cmdline_bool(f)
 
         if not selinux.is_selinux_enabled():

pyanaconda/installclasses/rhel.py

@@ -73,8 +73,8 @@ def __init__(self):
 class RHELAtomicInstallClass(RHELBaseInstallClass):
     name = "Red Hat Enterprise Linux Atomic Host"
     sortPriority=21000
-    if productName.startswith(("RHEL Atomic Host", "Red Hat Enterprise Linux Atomic")):
-        hidden = False
+    if not productName.startswith(("RHEL Atomic Host", "Red Hat Enterprise Linux Atomic")):
+        hidden = True
 
     def setDefaultPartitioning(self, storage):
         autorequests = [PartSpec(mountpoint="/", fstype=storage.defaultFSType,

pyanaconda/packaging/__init__.py

@@ -1027,7 +1027,7 @@ def addDriverRepos(self):
                 if not rpms:
                     continue
                 log.info("Running createrepo on %s", repo)
-                iutil.execWithRedirect("createrepo_c", [repo])
+                iutil.execWithRedirect("createrepo", [repo])
 
             ks_repo = self.data.RepoData(name="DD-%d" % dir_num,
                                          baseurl="file://"+repo,