4 commits - configure.ac revisor/base.py revisor/cfg.py revisor/image.py revisor/modisolinux revisor/modreuseinstaller revisor/pkgorder.py revisor/pungi.py revisor.spec.in unity/Makefile.am unity/scripts

[Jeroen van Meeuwen]

 configure.ac                             |    4 -
 revisor.spec.in                          |   92 +++++++++++++++++++++----------
 revisor/base.py                          |    4 -
 revisor/cfg.py                           |   10 +--
 revisor/image.py                         |   13 +++-
 revisor/modisolinux/__init__.py          |    4 -
 revisor/modreuseinstaller/__init__.py    |    2 
 revisor/pkgorder.py                      |    6 +-
 revisor/pungi.py                         |    2 
 unity/Makefile.am                        |   21 ++++++-
 unity/scripts/jigdofy_everything_spin.sh |    6 +-
 11 files changed, 112 insertions(+), 52 deletions(-)

New commits:
commit 50af9619622a948646557f46cd03980d4c8e11a4
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org&gt;
Date:   Mon Jan 4 14:43:16 2010 +0100

    Start shipping the Unity Scripts

diff --git a/configure.ac b/configure.ac
index 4188aad..9578789 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
-AC_INIT([revisor], 2.1.10)
-AC_SUBST([RELEASE], 4)
+AC_INIT([revisor], 2.1.11)
+AC_SUBST([RELEASE], 1)
 
 AC_CONFIG_SRCDIR(revisor/__init__.py.in)
 
diff --git a/revisor.spec.in b/revisor.spec.in
index d508267..29bb28f 100644
--- a/revisor.spec.in
+++ b/revisor.spec.in
@@ -12,6 +12,7 @@
 %define pkg_reuseinstaller 1
 %define pkg_server 0
 %define pkg_unity 1
+%define pkg_unity_scripts 1
 %define pkg_virt 0
 %define pkg_wui 0
 
@@ -63,61 +64,69 @@ Conflicts:      fedora-release < 7
 #Conflicts:      redhat-release < 5
 # Or:
 #Conflicts:      redhat-release = 4, redhat-release = 3
+Requires:       fedora-kickstarts
+Requires:       custom-kickstarts
 %if ! %{pkg_comps}
-Obsoletes:       revisor-comps < %{version}-%{release}
-Provides:        revisor-comps = %{version}-%{release}
+Obsoletes:      revisor-comps < %{version}-%{release}
+Provides:       revisor-comps = %{version}-%{release}
 %endif
 %if ! %{pkg_cobbler}
-Obsoletes:       revisor-cobbler < %{version}-%{release}
-Provides:        revisor-cobbler = %{version}-%{release}
+Obsoletes:      revisor-cobbler < %{version}-%{release}
+Provides:       revisor-cobbler = %{version}-%{release}
 %endif
 %if ! %{pkg_composer}
-Obsoletes:       revisor-composer < %{version}-%{release}
-Provides:        revisor-composer = %{version}-%{release}
+Obsoletes:      revisor-composer < %{version}-%{release}
+Provides:       revisor-composer = %{version}-%{release}
 %endif
 %if ! %{pkg_delta}
-Obsoletes:       revisor-delta < %{version}-%{release}
-Provides:        revisor-delta = %{version}-%{release}
+Obsoletes:      revisor-delta < %{version}-%{release}
+Provides:       revisor-delta = %{version}-%{release}
 %endif
 %if ! %{pkg_hub}
-Obsoletes:       revisor-hub < %{version}-%{release}
-Provides:        revisor-hub = %{version}-%{release}
+Obsoletes:      revisor-hub < %{version}-%{release}
+Provides:       revisor-hub = %{version}-%{release}
 %endif
 %if ! %{pkg_isolinux}
-Obsoletes:       revisor-isolinux < %{version}-%{release}
-Provides:        revisor-isolinux = %{version}-%{release}
+Obsoletes:      revisor-isolinux < %{version}-%{release}
+Provides:       revisor-isolinux = %{version}-%{release}
 %endif
 %if ! %{pkg_jigdo}
-Obsoletes:       revisor-jigdo < %{version}-%{release}
-Provides:        revisor-jigdo = %{version}-%{release}
+Obsoletes:      revisor-jigdo < %{version}-%{release}
+Provides:       revisor-jigdo = %{version}-%{release}
 %endif
 %if ! %{pkg_mock}
-Obsoletes:       revisor-mock < %{version}-%{release}
-Provides:        revisor-mock = %{version}-%{release}
+Obsoletes:      revisor-mock < %{version}-%{release}
+Provides:       revisor-mock = %{version}-%{release}
 %endif
 %if ! %{pkg_rebrand}
-Obsoletes:       revisor-rebrand < %{version}-%{release}
-Provides:        revisor-rebrand = %{version}-%{release}
+Obsoletes:      revisor-rebrand < %{version}-%{release}
+Provides:       revisor-rebrand = %{version}-%{release}
 %endif
 %if ! %{pkg_reuseinstaller}
-Obsoletes:       revisor-reuseinstaller < %{version}-%{release}
-Provides:        revisor-reuseinstaller = %{version}-%{release}
+Obsoletes:      revisor-reuseinstaller < %{version}-%{release}
+Provides:       revisor-reuseinstaller = %{version}-%{release}
 %endif
 %if ! %{pkg_server}
-Obsoletes:       revisor-server < %{version}-%{release}
-Provides:        revisor-server = %{version}-%{release}
+Obsoletes:      revisor-server < %{version}-%{release}
+Provides:       revisor-server = %{version}-%{release}
 %endif
 %if ! %{pkg_unity}
-Obsoletes:       revisor-unity < %{version}-%{release}
-Provides:        revisor-unity = %{version}-%{release}
+Obsoletes:      revisor-unity < %{version}-%{release}
+Provides:       revisor-unity = %{version}-%{release}
+%else
+Requires:       revisor-unity = %{version}-%{release}
+%endif
+%if ! %{pkg_unity_scripts}
+Obsoletes:      revisor-unity-scripts < %{version}-%{release}
+Provides:       revisor-unity-scripts = %{version}-%{release}
 %endif
 %if ! %{pkg_virt}
-Obsoletes:       revisor-virt < %{version}-%{release}
-Provides:        revisor-virt = %{version}-%{release}
+Obsoletes:      revisor-virt < %{version}-%{release}
+Provides:       revisor-virt = %{version}-%{release}
 %endif
 %if ! %{pkg_wui}
-Obsoletes:       revisor-wui < %{version}-%{release}
-Provides:        revisor-wui = %{version}-%{release}
+Obsoletes:      revisor-wui < %{version}-%{release}
+Provides:       revisor-wui = %{version}-%{release}
 %endif
 
 %description cli
@@ -298,6 +307,20 @@ Revisor to create Re-Spins and do testing.
 %endif
 
 ##
+## Fedora Unity Configuration and Scripts for Revisor
+##
+%if %{pkg_unity_scripts}
+%package unity-scripts
+Summary:    Fedora Unity Configuration and Scripts for Revisor
+Group:      Applications/System
+Requires:   revisor-cli
+
+%description unity-scripts
+The configuration files and scripts Fedora Unity uses with
+Revisor to create Re-Spins and do testing.
+%endif
+
+##
 ## Revisor virtualization plugin
 ##
 %if %{pkg_virt}
@@ -384,6 +407,10 @@ make install DESTDIR=$RPM_BUILD_ROOT
     rm -rf %{buildroot}/%{_datadir}/revisor/unity/
 %endif
 
+%if ! %{pkg_unity_scripts}
+    rm -rf %{buildroot}/%{_datadir}/revisor/unity/scripts/
+%endif
+
 %if ! %{pkg_virt}
     rm -rf %{buildroot}/%{python_sitelib}/revisor/modvirt
 %endif
@@ -545,7 +572,14 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_sysconfdir}/revisor-unity/conf.d
 %config(noreplace) %{_sysconfdir}/revisor-unity/*.conf
 %config(noreplace) %{_sysconfdir}/revisor-unity/conf.d/*
-%{_datadir}/revisor/unity/
+%dir %{_datadir}/revisor/unity/
+%{_datadir}/revisor/unity/*.*
+%endif
+
+%if %{pkg_unity_scripts}
+%files unity-scripts
+%defattr(-,root,root,-)
+%{_datadir}/revisor/unity/scripts/
 %endif
 
 %if %{pkg_virt}
diff --git a/unity/Makefile.am b/unity/Makefile.am
index f326e45..6f2b662 100644
--- a/unity/Makefile.am
+++ b/unity/Makefile.am
@@ -16,6 +16,24 @@ unitydata_DATA = \
 	share/fedora-12-single-cd_isolinux.cfg \
 	share/fedora-12-respin.cfg
 
+scriptdatadir = $(pkgdatadir)/unity/scripts/
+scriptdata_DATA = \
+	scripts/find_updated_packages.sh \
+	scripts/gold_vs_respin.sh \
+	scripts/jigdofy_everything.sh \
+	scripts/jigdofy_everything_spin.sh \
+	scripts/jigdofy_release.sh \
+	scripts/jigdofy_single-cd_spin.sh \
+	scripts/live-respin-size-diff.py \
+	scripts/make_me_source_iso.sh \
+	scripts/mock_build_srpm.sh \
+	scripts/mock_respins.sh \
+	scripts/respin.sh \
+	scripts/sync_repo.sh \
+	scripts/torrentify_everything_spin.sh \
+	scripts/torrentify_respin.sh \
+	scripts/torrentify_single-cd_spin.sh
+
 revisorconfdir = $(sysconfdir)/revisor-unity/conf.d/
 revisorconf_DATA = \
 	conf/conf.d/fedora-12-everything.cfg \
@@ -259,4 +277,5 @@ EXTRA_DIST = \
     conf/conf.d/revisor-f11-x86_64-live-xfce-respin.conf \
     $(etcconf_DATA) \
     $(revisorconf_DATA) \
-	$(unitydata_DATA)
+	$(unitydata_DATA) \
+	$(scriptdata_DATA)


commit 5921e7a936350304ca9470aabc2df61a3f8d8396
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org&gt;
Date:   Mon Jan 4 14:38:56 2010 +0100

    Fix up jigdofy_everything.sh

diff --git a/unity/scripts/jigdofy_everything_spin.sh
b/unity/scripts/jigdofy_everything_spin.sh
index 353979b..982e98e 100755
--- a/unity/scripts/jigdofy_everything_spin.sh
+++ b/unity/scripts/jigdofy_everything_spin.sh
@@ -6,9 +6,9 @@ function jigdofy() {
                 /data/os/distr/fedora/releases/${version}/Fedora/$2/os// \
                 /data/os/distr/fedora/releases/${version}/Everything/$2/os// \
                 --label
"Fedora-$2"="/data/os/distr/fedora/releases/${version}/Fedora/$2/os"
\
-		--uri
"Fedora-$2"="http://mirrors.fedoraproject.org/mirrorlist?redirect=1&path=pub/fedora/linux/releases/${version}/Fedora/$2/os/"
\
+                --uri
"Fedora-$2"="http://mirrors.fedoraproject.org/mirrorlist?redirect=1&path=pub/fedora/linux/releases/${version}/Fedora/$2/os/"
\
                 --label
"Everything-$2"="/data/os/distr/fedora/releases/${version}/Everything/$2/os"
\
-		--uri
"Everything-$2"="http://mirrors.fedoraproject.org/mirrorlist?redirect=1&path=pub/fedora/linux/releases/${version}/Everything/$2/os/"
\
+                --uri
"Everything-$2"="http://mirrors.fedoraproject.org/mirrorlist?redirect=1&path=pub/fedora/linux/releases/${version}/Everything/$2/os/"
\
                 --jigdo=$jigdofile \
                
--template=/var/www/jigdo/templates/Fedora-${version}-Everything/`basename $1`.template \
                 --force --merge=$jigdofile \
@@ -55,5 +55,5 @@ done
 ##cat /srv/revisor/*/iso/SHA1SUM >>
/var/www/jigdo/templates/${datestamp}/Fedora-Unity-${datestamp}-${version}.SHA1SUM
 
 sed -i -e "s/\+/\%2b/g" $jigdofile
-sed -i -e
"s/Template=F/Template=http:\/\/jigdo.fedoraunity.org\/templates\/Fedora-11-Everything\/F/g"
$jigdofile
+sed -i -e
"s/Template=F/Template=http:\/\/jigdo.fedoraunity.org\/templates\/Fedora-${version}-Everything\/F/g"
$jigdofile
 


commit 60488c4ddf26e5a170cfd21d6c31431de0723432
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org&gt;
Date:   Mon Jan 4 14:38:05 2010 +0100

    Get rid of $TMPDIR/revisor-pungi

diff --git a/revisor/base.py b/revisor/base.py
index 3c30b71..b4df62d 100644
--- a/revisor/base.py
+++ b/revisor/base.py
@@ -1158,7 +1158,7 @@ class RevisorBase:
 
             run_buildinstall = False
             for file in files:
-                if not os.access("%s/revisor-pungi/%s/%s/%s/os/%s" %
(self.cfg.working_directory, self.cfg.version, self.cfg.model, self.cfg.architecture,
file), os.R_OK):
+                if not os.access("%s/revisor-install/%s/%s/%s/os/%s" %
(self.cfg.working_directory, self.cfg.version, self.cfg.model, self.cfg.architecture,
file), os.R_OK):
 
                     run_buildinstall = True
 
@@ -1174,7 +1174,7 @@ class RevisorBase:
 #            # Nuke stage2.img
 #            if self.cfg.install_nogr:
 #                try:
-#                    os.unlink(os.path.join(self.cfg.working_directory,
"revisor-pungi", self.cfg.version, self.cfg.model, self.cfg.architecture,
"os", "images", "stage2.img"))
+#                    os.unlink(os.path.join(self.cfg.working_directory,
"revisor-install", self.cfg.version, self.cfg.model, self.cfg.architecture,
"os", "images", "stage2.img"))
 #                except:
 #                    pass
 
diff --git a/revisor/cfg.py b/revisor/cfg.py
index 0a9343b..801344b 100644
--- a/revisor/cfg.py
+++ b/revisor/cfg.py
@@ -134,7 +134,7 @@ class ConfigStore:
             # No xsltproc no glory
             return self.comps
 
-        self.comps =
os.path.join(self.working_directory,"revisor-pungi",self.version,self.model,"comps.xml")
+        self.comps =
os.path.join(self.working_directory,"revisor-install",self.version,self.model,"comps.xml")
 
         doc = libxml2.newDoc("1.0")
         dtd = doc.newDtd('comps', '-//Red Hat, Inc.//DTD Comps info//EN',
'comps.dtd')
@@ -199,7 +199,7 @@ class ConfigStore:
             # No xsltproc no glory
             return self.comps
 
-        self.comps =
os.path.join(self.working_directory,"revisor-pungi",self.version,self.revisor_model,"comps.xml")
+        self.comps =
os.path.join(self.working_directory,"revisor-install",self.version,self.revisor_model,"comps.xml")
         ourcomps = open(self.comps, "w")
 
         ourcomps.write("<?xml version=\"1.0\"
encoding=\"UTF-8\"?>\n<!DOCTYPE comps PUBLIC \"-//Red Hat, Inc.//DTD
Comps info//EN\" \"comps.dtd\">\n<comps>\n")
@@ -245,7 +245,7 @@ class ConfigStore:
         complain = False
         if os.access(os.path.join(self.working_directory,"pungi-revisor"),
os.R_OK):
             complain = True
-        if os.access(os.path.join(self.working_directory,"revisor-pungi"),
os.R_OK):
+        if os.access(os.path.join(self.working_directory,"revisor-install"),
os.R_OK):
             complain = True
         if os.access(os.path.join(self.working_directory,"revisor"), os.R_OK):
             complain = True
@@ -264,8 +264,8 @@ class ConfigStore:
             complain = False
             if os.access(os.path.join(self.working_directory,"pungi-revisor"),
os.R_OK):
                
shutil.rmtree(os.path.join(self.working_directory,"pungi-revisor"))
-            if os.access(os.path.join(self.working_directory,"revisor-pungi"),
os.R_OK):
-               
shutil.rmtree(os.path.join(self.working_directory,"revisor-pungi"))
+            if
os.access(os.path.join(self.working_directory,"revisor-install"), os.R_OK):
+               
shutil.rmtree(os.path.join(self.working_directory,"revisor-install"))
             if os.access(os.path.join(self.working_directory,"revisor"),
os.R_OK):
                 if os.path.ismount("%s%s" %
(self.working_directory,"revisor")):
                     for f in ["/sys", "/proc", "/dev/pts",
"/dev", "/selinux", "/yum-cache",
"/var/cache/yum", ""]:
diff --git a/revisor/modisolinux/__init__.py b/revisor/modisolinux/__init__.py
index d6ff0e0..83e345d 100644
--- a/revisor/modisolinux/__init__.py
+++ b/revisor/modisolinux/__init__.py
@@ -83,10 +83,10 @@ class RevisorIsolinux:
         if not self.cfg.isolinux_cfg == False and not self.cfg.isolinux_cfg ==
"":
             self.log.debug(_("Going to replace isolinux/isolinux.cfg with %s")
% (self.cfg.isolinux_cfg), level=7)
             try:
-                os.unlink(os.path.join(self.cfg.working_directory,
"revisor-pungi", self.cfg.version, self.cfg.model, self.cfg.architecture,
"os", "isolinux", "isolinux.cfg"))
+                os.unlink(os.path.join(self.cfg.working_directory,
"revisor-install", self.cfg.version, self.cfg.model, self.cfg.architecture,
"os", "isolinux", "isolinux.cfg"))
                 self.log.debug(_("Deleted the old isolinux.cfg"), level=9)
                 try:
-                    shutil.copy(self.cfg.isolinux_cfg,
os.path.join(self.cfg.working_directory, "revisor-pungi", self.cfg.version,
self.cfg.model, self.cfg.architecture, "os", "isolinux",
"isolinux.cfg"))
+                    shutil.copy(self.cfg.isolinux_cfg,
os.path.join(self.cfg.working_directory, "revisor-install", self.cfg.version,
self.cfg.model, self.cfg.architecture, "os", "isolinux",
"isolinux.cfg"))
                     self.log.debug(_("Inserted the new isolinux.cfg"),
level=9)
                 except:
                     self.log.warning(_("Could not copy in the new
isolinux.cfg"))
diff --git a/revisor/modreuseinstaller/__init__.py
b/revisor/modreuseinstaller/__init__.py
index c9e81de..ff1db0a 100644
--- a/revisor/modreuseinstaller/__init__.py
+++ b/revisor/modreuseinstaller/__init__.py
@@ -80,7 +80,7 @@ class RevisorReuseinstaller:
         else:
             dirs = [ "EFI", "isolinux", "images" ]
 
-        target = os.path.join(self.cfg.working_directory, "revisor-pungi",
self.cfg.version, self.cfg.model, self.cfg.architecture, "os")
+        target = os.path.join(self.cfg.working_directory, "revisor-install",
self.cfg.version, self.cfg.model, self.cfg.architecture, "os")
 
         for dir in dirs:
             if os.access(os.path.join(self.cfg.reuse, dir), os.R_OK):
diff --git a/revisor/pkgorder.py b/revisor/pkgorder.py
index 9e1c83e..99319bd 100644
--- a/revisor/pkgorder.py
+++ b/revisor/pkgorder.py
@@ -63,13 +63,13 @@ class PackageOrderer(yum.YumBase):
                 self.arch = "i686"
 
         # We're gonna use this an awful lot
-        self.toppath =
os.path.join(self.cfg.working_directory,"revisor-pungi",self.cfg.version,self.cfg.model,self.cfg.architecture,"os")
+        self.toppath =
os.path.join(self.cfg.working_directory,"revisor-install",self.cfg.version,self.cfg.model,self.cfg.architecture,"os")
 
-        self.cfg.pkgorder_file =
os.path.join(self.cfg.working_directory,"revisor-pungi","pkgorder-file")
+        self.cfg.pkgorder_file =
os.path.join(self.cfg.working_directory,"revisor-install","pkgorder-file")
         # If we have a pkgorder file set already, see if we can use that one.
         self.log.debug("Setting pkgorder_file to %s" % self.cfg.pkgorder_file)
 
-        self.testpath =
tempfile.mkdtemp(dir=os.path.join(self.cfg.working_directory,"revisor-pungi"),
prefix="pkgorder-root-")
+        self.testpath =
tempfile.mkdtemp(dir=os.path.join(self.cfg.working_directory,"revisor-install"),
prefix="pkgorder-root-")
         os.makedirs(os.path.join(self.testpath,"etc"))
 
     def addGroups(self, groupLst):
diff --git a/revisor/pungi.py b/revisor/pungi.py
index 03669f6..8086738 100644
--- a/revisor/pungi.py
+++ b/revisor/pungi.py
@@ -37,7 +37,7 @@ class RevisorPungi:
         self.cfg = base.cfg
         self.log = base.log
 
-        self.destdir =
os.path.join(self.cfg.working_directory,"revisor-pungi")
+        self.destdir =
os.path.join(self.cfg.working_directory,"revisor-install")
         self.archdir = os.path.join(self.destdir,
                                    self.cfg.version,
                                    self.cfg.model,


commit 4a1adc6a97a2f076e8da45c706980a1733567a23
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org&gt;
Date:   Mon Jan 4 14:37:48 2010 +0100

    Be more verbose if errors keep occuring

diff --git a/revisor/image.py b/revisor/image.py
index 406955e..45ce221 100644
--- a/revisor/image.py
+++ b/revisor/image.py
@@ -89,9 +89,16 @@ class ImageCreator(imgcreate.creator.ImageCreator):
         if os.access(self.cfg.yumobj.conf.installroot + "/etc/yum.conf",
os.R_OK):
             os.unlink(self.cfg.yumobj.conf.installroot + "/etc/yum.conf")
 
-        self.log.error(_("""Error encountered during installation of the
software you selected:
-
---> %s""") % '\r\n--> '.join([message for (message,
details,) in errs.value]), recoverable=False)
+        try:
+            self.log.error(_(   "Error encountered during installation of " +
\
+                                "the software you selected:\r\n\r\n" + \
+                                "--> %s") % '\r\n-->
'.join([message for (message, details,) in errs.value]), recoverable=False)
+        except AttributeError:
+            self.log.debug(_("An additional error in the error. The value of errs
is: %s") % errs, level=9)
+            self.log.error(_(   "An error occurred during the installation " +
\
+                                "of the software you selected, and an " + \
+                                "additional error occurred trying to " + \
+                                "describe what went wrong exactly."),
recoverable=False)
 
     def runInstall(self, pbar=None):