revisor/base.py revisor/__init__.py.in revisor/logger.py revisor/misc.py
by Jeroen van Meeuwen
revisor/__init__.py.in | 5 +++++
revisor/base.py | 2 +-
revisor/logger.py | 4 ++--
revisor/misc.py | 9 ++++++++-
4 files changed, 16 insertions(+), 4 deletions(-)
New commits:
commit bfd709e4c761b47c7a40ae32dcbb886b59ea3981
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Sun Mar 8 17:49:01 2009 +0100
Add --logfile
State start and end times of inclusive dependency resolving
diff --git a/revisor/__init__.py.in b/revisor/__init__.py.in
index 8457920..df91404 100644
--- a/revisor/__init__.py.in
+++ b/revisor/__init__.py.in
@@ -155,6 +155,11 @@ class Revisor:
type = 'int',
help = _("Set debugging level (0 by default)"))
+ runtime_group.add_option( "--logfile",
+ dest = "logfile",
+ default = "/var/log/revisor.log",
+ help = _("Use a different logfile"))
+
##
## Redundant Options
##
diff --git a/revisor/base.py b/revisor/base.py
index 84c91cd..4f85393 100644
--- a/revisor/base.py
+++ b/revisor/base.py
@@ -142,7 +142,7 @@ class RevisorBase:
self.cli_options.debuglevel = 0
# Initialize logger
- self.log = revisor.logger.Logger(loglevel=loglevel, debuglevel=self.cli_options.debuglevel)
+ self.log = revisor.logger.Logger(loglevel=loglevel, debuglevel=self.cli_options.debuglevel, logfile=self.cli_options.logfile)
def create_configstore(self):
"""Initialize Configuration Store"""
diff --git a/revisor/logger.py b/revisor/logger.py
index a915116..6a5cff1 100644
--- a/revisor/logger.py
+++ b/revisor/logger.py
@@ -25,7 +25,7 @@ import sys
from rhpl.translate import _
class Logger:
- def __init__(self, loglevel=logging.INFO, debuglevel=0):
+ def __init__(self, loglevel=logging.INFO, debuglevel=0, logfile="/var/log/revisor.log"):
self.loglevel = loglevel
self.debuglevel = debuglevel
@@ -34,7 +34,7 @@ class Logger:
console_stdout = logging.StreamHandler(sys.stdout)
console_stdout.setFormatter(plaintextformatter)
- filelog_handler = logging.FileHandler(filename="/var/log/revisor.log")
+ filelog_handler = logging.FileHandler(filename=logfile)
filelog_handler.setFormatter(plaintextformatter)
self.log = logging.getLogger()
diff --git a/revisor/misc.py b/revisor/misc.py
index 8df46bc..1a20b86 100644
--- a/revisor/misc.py
+++ b/revisor/misc.py
@@ -17,6 +17,7 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+import datetime
import logging
import os
import re
@@ -159,8 +160,12 @@ def resolve_dependencies_inclusive(yumobj, logger=None, pbar=None, resolved_deps
logger.debug(_("Checking dependencies - allowing conflicts within the package set"), level=5)
reqs = []
+
+ logger.debug(_("Inclusive dependency resolving starts at %s") % datetime.datetime.now(), level=8)
+
for txmbr in yumobj.tsInfo.getMembers():
- reqs.append(txmbr.po.requires)
+ reqs.extend(txmbr.po.requires)
+
reqs = yum.misc.unique(reqs)
moretoprocess = True
@@ -172,6 +177,8 @@ def resolve_dependencies_inclusive(yumobj, logger=None, pbar=None, resolved_deps
(resolved_deps, final_pkgobjs) = get_package_deps(yumobj, txmbr.po, pbar, logger=logger, resolved_deps=resolved_deps, final_pkgobjs=final_pkgobjs)
moretoprocess = True
+ logger.debug(_("Inclusive dependency resolving ends at %s") % datetime.datetime.now(), level=8)
+
return (resolved_deps, final_pkgobjs)
#yumobj.tsInfo.makelists()
15 years, 2 months
unity/scripts
by Jeroen van Meeuwen
unity/scripts/live-respin-size-diff.py | 6 ++++++
1 file changed, 6 insertions(+)
New commits:
commit c6c8b95eadb4cf48445e0eccc59c2000bbdfe334
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Sun Mar 8 16:58:52 2009 +0100
Also list the removed packages
diff --git a/unity/scripts/live-respin-size-diff.py b/unity/scripts/live-respin-size-diff.py
index 9a5e6c0..4128576 100755
--- a/unity/scripts/live-respin-size-diff.py
+++ b/unity/scripts/live-respin-size-diff.py
@@ -26,13 +26,19 @@ for (pkg, size) in newpkgs.items():
if not oldpkgs.has_key(pkg):
print "new package %s: %s" %(pkg, size)
continue
+
oldsize = oldpkgs[pkg]
if oldsize == "0":
continue
+
deltapct = (int(size) - int(oldsize)) / float(oldsize)
if deltapct > THRESH:
print "%s grew by %.2f%% (%s->%s)" %(pkg, deltapct*100, oldsize, size)
+for (pkg, size) in oldpkgs.items():
+ if not newpkgs.has_key(pkg):
+ print "removed package %s: %s" %(pkg, size)
+
print "Old Live Re-Spin at %s has %d packages" %(old,len(oldpkgs),)
print "New Live Re-Spin at %s has %d packages" %(new,len(newpkgs),)
15 years, 2 months
unity/conf
by Jeroen van Meeuwen
unity/conf/rawhide-live-respin.conf | 128 ------------------------------------
1 file changed, 128 deletions(-)
New commits:
commit 50d73138335869067738e1c2ef45e9906f13f458
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Sun Mar 8 04:06:32 2009 +0100
Remove the developer spin
diff --git a/unity/conf/rawhide-live-respin.conf b/unity/conf/rawhide-live-respin.conf
index 305bbb4..f7c420f 100644
--- a/unity/conf/rawhide-live-respin.conf
+++ b/unity/conf/rawhide-live-respin.conf
@@ -94,38 +94,6 @@ iso_label = FU Live $datestamp
architecture = i386
kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-desktop-pt_PT.ks
-[rawhide-i386-live-developer-respin]
-description = Fedora Unity Live Developer Re-Spin Model for Fedora rawhide
-main = /etc/revisor-unity/conf.d/revisor-rawhide-i386-live-developer-respin.conf
-iso_basename = Fedora-Unity-Developer-$datestamp
-iso_label = FU Live Developer $datestamp
-architecture = i386
-kickstart_file = /usr/share/spin-kickstarts/fedora-livedvd-developer.ks
-
-[rawhide-i386-live-developer-de_CH-respin]
-description = Fedora Unity Live Developer de_CH Re-Spin Model for Fedora rawhide
-main = /etc/revisor-unity/conf.d/revisor-rawhide-i386-live-developer-respin.conf
-iso_basename = Fedora-Unity-Developer-de_CH-$datestamp
-iso_label = FU Live Developer $datestamp
-architecture = i386
-kickstart_file = /usr/share/spin-kickstarts/fedora-livedvd-developer-de_CH.ks
-
-[rawhide-i386-live-developer-nl_NL-respin]
-description = Fedora Unity Live Developer nl_NL Re-Spin Model for Fedora rawhide
-main = /etc/revisor-unity/conf.d/revisor-rawhide-i386-live-developer-respin.conf
-iso_basename = Fedora-Unity-Developer-nl_NL-$datestamp
-iso_label = FU Live Developer $datestamp
-architecture = i386
-kickstart_file = /usr/share/spin-kickstarts/fedora-livedvd-developer-nl_NL.ks
-
-[rawhide-i386-live-developer-pt_PT-respin]
-description = Fedora Unity Live Developer pt_PT Re-Spin Model for Fedora rawhide
-main = /etc/revisor-unity/conf.d/revisor-rawhide-i386-live-developer-respin.conf
-iso_basename = Fedora-Unity-Developer-pt_PT-$datestamp
-iso_label = FU Live Developer $datestamp
-architecture = i386
-kickstart_file = /usr/share/spin-kickstarts/fedora-livedvd-developer-pt_PT.ks
-
[rawhide-i386-live-education-respin]
description = Fedora Unity Live Education Re-Spin Model for Fedora rawhide
main = /etc/revisor-unity/conf.d/revisor-rawhide-i386-live-education-respin.conf
@@ -334,38 +302,6 @@ iso_label = FU Live $datestamp
architecture = x86_64
kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-desktop-pt_PT.ks
-[rawhide-x86_64-live-developer-respin]
-description = Fedora Unity Live Developer Re-Spin Model for Fedora rawhide
-main = /etc/revisor-unity/conf.d/revisor-rawhide-x86_64-live-developer-respin.conf
-iso_basename = Fedora-Unity-Developer-$datestamp
-iso_label = FU Live Developer $datestamp
-architecture = x86_64
-kickstart_file = /usr/share/spin-kickstarts/fedora-livedvd-developer.ks
-
-[rawhide-x86_64-live-developer-de_CH-respin]
-description = Fedora Unity Live Developer de_CH Re-Spin Model for Fedora rawhide
-main = /etc/revisor-unity/conf.d/revisor-rawhide-x86_64-live-developer-respin.conf
-iso_basename = Fedora-Unity-Developer-de_CH-$datestamp
-iso_label = FU Live Developer $datestamp
-architecture = x86_64
-kickstart_file = /usr/share/spin-kickstarts/fedora-livedvd-developer-de_CH.ks
-
-[rawhide-x86_64-live-developer-nl_NL-respin]
-description = Fedora Unity Live Developer nl_NL Re-Spin Model for Fedora rawhide
-main = /etc/revisor-unity/conf.d/revisor-rawhide-x86_64-live-developer-respin.conf
-iso_basename = Fedora-Unity-Developer-nl_NL-$datestamp
-iso_label = FU Live Developer $datestamp
-architecture = x86_64
-kickstart_file = /usr/share/spin-kickstarts/fedora-livedvd-developer-nl_NL.ks
-
-[rawhide-x86_64-live-developer-pt_PT-respin]
-description = Fedora Unity Live Developer pt_PT Re-Spin Model for Fedora rawhide
-main = /etc/revisor-unity/conf.d/revisor-rawhide-x86_64-live-developer-respin.conf
-iso_basename = Fedora-Unity-Developer-pt_PT-$datestamp
-iso_label = FU Live Developer $datestamp
-architecture = x86_64
-kickstart_file = /usr/share/spin-kickstarts/fedora-livedvd-developer-pt_PT.ks
-
[rawhide-x86_64-live-education-respin]
description = Fedora Unity Live Education Re-Spin Model for Fedora rawhide
main = /etc/revisor-unity/conf.d/revisor-rawhide-x86_64-live-education-respin.conf
@@ -574,38 +510,6 @@ iso_label = FU Live $datestamp
architecture = ppc
kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-desktop-pt_PT.ks
-[rawhide-ppc-live-developer-respin]
-description = Fedora Unity Live Developer Re-Spin Model for Fedora rawhide
-main = /etc/revisor-unity/conf.d/revisor-rawhide-ppc-live-developer-respin.conf
-iso_basename = Fedora-Unity-Developer-$datestamp
-iso_label = FU Live Developer $datestamp
-architecture = ppc
-kickstart_file = /usr/share/spin-kickstarts/fedora-livedvd-developer.ks
-
-[rawhide-ppc-live-developer-de_CH-respin]
-description = Fedora Unity Live Developer de_CH Re-Spin Model for Fedora rawhide
-main = /etc/revisor-unity/conf.d/revisor-rawhide-ppc-live-developer-respin.conf
-iso_basename = Fedora-Unity-Developer-de_CH-$datestamp
-iso_label = FU Live Developer $datestamp
-architecture = ppc
-kickstart_file = /usr/share/spin-kickstarts/fedora-livedvd-developer-de_CH.ks
-
-[rawhide-ppc-live-developer-nl_NL-respin]
-description = Fedora Unity Live Developer nl_NL Re-Spin Model for Fedora rawhide
-main = /etc/revisor-unity/conf.d/revisor-rawhide-ppc-live-developer-respin.conf
-iso_basename = Fedora-Unity-Developer-nl_NL-$datestamp
-iso_label = FU Live Developer $datestamp
-architecture = ppc
-kickstart_file = /usr/share/spin-kickstarts/fedora-livedvd-developer-nl_NL.ks
-
-[rawhide-ppc-live-developer-pt_PT-respin]
-description = Fedora Unity Live Developer pt_PT Re-Spin Model for Fedora rawhide
-main = /etc/revisor-unity/conf.d/revisor-rawhide-ppc-live-developer-respin.conf
-iso_basename = Fedora-Unity-Developer-pt_PT-$datestamp
-iso_label = FU Live Developer $datestamp
-architecture = ppc
-kickstart_file = /usr/share/spin-kickstarts/fedora-livedvd-developer-pt_PT.ks
-
[rawhide-ppc-live-education-respin]
description = Fedora Unity Live Education Re-Spin Model for Fedora rawhide
main = /etc/revisor-unity/conf.d/revisor-rawhide-ppc-live-education-respin.conf
@@ -814,38 +718,6 @@ iso_label = FU Live $datestamp
architecture = ppc64
kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-desktop-pt_PT.ks
-[rawhide-ppc64-live-developer-respin]
-description = Fedora Unity Live Developer Re-Spin Model for Fedora rawhide
-main = /etc/revisor-unity/conf.d/revisor-rawhide-ppc64-live-developer-respin.conf
-iso_basename = Fedora-Unity-Developer-$datestamp
-iso_label = FU Live Developer $datestamp
-architecture = ppc64
-kickstart_file = /usr/share/spin-kickstarts/fedora-livedvd-developer.ks
-
-[rawhide-ppc64-live-developer-de_CH-respin]
-description = Fedora Unity Live Developer de_CH Re-Spin Model for Fedora rawhide
-main = /etc/revisor-unity/conf.d/revisor-rawhide-ppc64-live-developer-respin.conf
-iso_basename = Fedora-Unity-Developer-de_CH-$datestamp
-iso_label = FU Live Developer $datestamp
-architecture = ppc64
-kickstart_file = /usr/share/spin-kickstarts/fedora-livedvd-developer-de_CH.ks
-
-[rawhide-ppc64-live-developer-nl_NL-respin]
-description = Fedora Unity Live Developer nl_NL Re-Spin Model for Fedora rawhide
-main = /etc/revisor-unity/conf.d/revisor-rawhide-ppc64-live-developer-respin.conf
-iso_basename = Fedora-Unity-Developer-nl_NL-$datestamp
-iso_label = FU Live Developer $datestamp
-architecture = ppc64
-kickstart_file = /usr/share/spin-kickstarts/fedora-livedvd-developer-nl_NL.ks
-
-[rawhide-ppc64-live-developer-pt_PT-respin]
-description = Fedora Unity Live Developer pt_PT Re-Spin Model for Fedora rawhide
-main = /etc/revisor-unity/conf.d/revisor-rawhide-ppc64-live-developer-respin.conf
-iso_basename = Fedora-Unity-Developer-pt_PT-$datestamp
-iso_label = FU Live Developer $datestamp
-architecture = ppc64
-kickstart_file = /usr/share/spin-kickstarts/fedora-livedvd-developer-pt_PT.ks
-
[rawhide-ppc64-live-education-respin]
description = Fedora Unity Live Education Re-Spin Model for Fedora rawhide
main = /etc/revisor-unity/conf.d/revisor-rawhide-ppc64-live-education-respin.conf
15 years, 2 months
unity/scripts
by Jeroen van Meeuwen
unity/scripts/respin.sh | 44 +++++++++++++++++++++++---------------------
1 file changed, 23 insertions(+), 21 deletions(-)
New commits:
commit 710d5fc8c35b153bedba83da374fb69fa990fec1
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Sun Mar 8 03:46:35 2009 +0100
Update respin.sh to not send out notifications for each respin
diff --git a/unity/scripts/respin.sh b/unity/scripts/respin.sh
index d4a018a..f000df8 100755
--- a/unity/scripts/respin.sh
+++ b/unity/scripts/respin.sh
@@ -276,18 +276,18 @@ for version in ${VERSIONS}; do
[ ! -z "$isoimage" ] && isosize=`ls -lh $isoimage | awk '{print $5}'` || isosize="0M"
if [ $retval -gt 0 ]; then
- printf "Spin $spin failed, log file attached.$MESSAGE_END" "N/A" "$datestamp" "$spin" \
- | mail -s "[respin] $spin $datestamp failed" \
- -a revisor-$spin.log \
- -r $NOTIFICATION_FROMADD \
- -c $NOTIFICATION_FAILURE $NOTIFICATION_SUCCESS
+# printf "Spin $spin failed, log file attached.$MESSAGE_END" "N/A" "$datestamp" "$spin" \
+# | mail -s "[respin] $spin $datestamp failed" \
+# -a revisor-$spin.log \
+# -r $NOTIFICATION_FROMADD \
+# -c $NOTIFICATION_FAILURE $NOTIFICATION_SUCCESS
sudo touch ${REVISORDIR}/$datestamp/$spin.failed
else
- printf "Spin $spin succeeded, log file attached.$MESSAGE_END" "$isosize" "$datestamp" "$spin" \
- | mail -s "[respin] $spin $datestamp succeeded" \
- -a revisor-$spin.log \
- -r $NOTIFICATION_FROMADD \
- $NOTIFICATION_SUCCESS
+# printf "Spin $spin succeeded, log file attached.$MESSAGE_END" "$isosize" "$datestamp" "$spin" \
+# | mail -s "[respin] $spin $datestamp succeeded" \
+# -a revisor-$spin.log \
+# -r $NOTIFICATION_FROMADD \
+# $NOTIFICATION_SUCCESS
sudo touch ${REVISORDIR}/$datestamp/$spin.success
fi
@@ -408,18 +408,18 @@ for version in ${VERSIONS}; do
retval=$?
if [ $retval -gt 0 ]; then
- printf "Spin ${real_version}-$arch-respin failed, log file attached.$MESSAGE_END" "N/A" "$datestamp" "${real_version}-$arch-respin" \
- | mail -s "[respin] ${real_version}-$arch-respin $datestamp failed" \
- -a revisor-${real_version}-$arch-respin.log \
- -r $NOTIFICATION_FROMADD \
- -c $NOTIFICATION_FAILURE $NOTIFICATION_SUCCESS
+# printf "Spin ${real_version}-$arch-respin failed, log file attached.$MESSAGE_END" "N/A" "$datestamp" "${real_version}-$arch-respin" \
+# | mail -s "[respin] ${real_version}-$arch-respin $datestamp failed" \
+# -a revisor-${real_version}-$arch-respin.log \
+# -r $NOTIFICATION_FROMADD \
+# -c $NOTIFICATION_FAILURE $NOTIFICATION_SUCCESS
sudo touch ${REVISORDIR}/$datestamp/${real_version}-$arch-respin.failed
else
- printf "Spin ${real_version}-$arch-respin succeeded, log file attached.$MESSAGE_END" "N/A" "$datestamp" "${real_version}-$arch-respin" \
- | mail -s "[respin] ${real_version}-$arch-respin $datestamp succeeded" \
- -a revisor-${real_version}-$arch-respin.log \
- -r $NOTIFICATION_FROMADD \
- $NOTIFICATION_SUCCESS
+# printf "Spin ${real_version}-$arch-respin succeeded, log file attached.$MESSAGE_END" "N/A" "$datestamp" "${real_version}-$arch-respin" \
+# | mail -s "[respin] ${real_version}-$arch-respin $datestamp succeeded" \
+# -a revisor-${real_version}-$arch-respin.log \
+# -r $NOTIFICATION_FROMADD \
+# $NOTIFICATION_SUCCESS
sudo touch ${REVISORDIR}/$datestamp/${real_version}-$arch-respin.success
fi
@@ -454,5 +454,7 @@ for version in ${VERSIONS}; do
fi
fi
+ echo -n "${arch} Respins for Fedora ${version} are done.\n\nCheckout http://www.kanarip.com/revisor for more details\n\nKind regards,\n\nJeroen van Meeuwen\n-kanarip" | \
+ mail -s "Fedora ${version} ${arch} Respin Report" -r $NOTIFICATION_FROMADD $NOTIFICATION_SUCCESS
done
-done
+done
\ No newline at end of file
15 years, 2 months
unity/conf
by Jeroen van Meeuwen
unity/conf/rawhide-live-respin.conf | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
New commits:
commit cbcc5945b77d5000acf54351451a41bdb7f458b9
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Sun Mar 8 03:03:19 2009 +0100
This spin is actually called desktop (not desktop-default)
diff --git a/unity/conf/rawhide-live-respin.conf b/unity/conf/rawhide-live-respin.conf
index 106c277..305bbb4 100644
--- a/unity/conf/rawhide-live-respin.conf
+++ b/unity/conf/rawhide-live-respin.conf
@@ -46,13 +46,13 @@ iso_label = FU Live $datestamp
architecture = i386
kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-broffice.org.ks
-[rawhide-i386-live-desktop-default-respin]
+[rawhide-i386-live-desktop-respin]
description = Fedora Unity Live Desktop Re-Spin Model for Fedora rawhide
main = /etc/revisor-unity/conf.d/revisor-rawhide-i386-live-desktop-respin.conf
iso_basename = Fedora-Unity-Desktop-$datestamp
iso_label = FU Live $datestamp
architecture = i386
-kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-desktop-default.ks
+kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-desktop.ks
[rawhide-i386-live-desktop-de_CH-respin]
description = Fedora Unity Live Desktop de_CH Re-Spin Model for Fedora rawhide
@@ -286,13 +286,13 @@ iso_label = FU Live $datestamp
architecture = x86_64
kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-broffice.org.ks
-[rawhide-x86_64-live-desktop-default-respin]
+[rawhide-x86_64-live-desktop-respin]
description = Fedora Unity Live Desktop Re-Spin Model for Fedora rawhide
main = /etc/revisor-unity/conf.d/revisor-rawhide-x86_64-live-desktop-respin.conf
iso_basename = Fedora-Unity-Desktop-$datestamp
iso_label = FU Live $datestamp
architecture = x86_64
-kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-desktop-default.ks
+kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-desktop.ks
[rawhide-x86_64-live-desktop-de_CH-respin]
description = Fedora Unity Live Desktop de_CH Re-Spin Model for Fedora rawhide
@@ -526,13 +526,13 @@ iso_label = FU Live $datestamp
architecture = ppc
kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-broffice.org.ks
-[rawhide-ppc-live-desktop-default-respin]
+[rawhide-ppc-live-desktop-respin]
description = Fedora Unity Live Desktop Re-Spin Model for Fedora rawhide
main = /etc/revisor-unity/conf.d/revisor-rawhide-ppc-live-desktop-respin.conf
iso_basename = Fedora-Unity-Desktop-$datestamp
iso_label = FU Live $datestamp
architecture = ppc
-kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-desktop-default.ks
+kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-desktop.ks
[rawhide-ppc-live-desktop-de_CH-respin]
description = Fedora Unity Live Desktop de_CH Re-Spin Model for Fedora rawhide
@@ -766,13 +766,13 @@ iso_label = FU Live $datestamp
architecture = ppc64
kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-broffice.org.ks
-[rawhide-ppc64-live-desktop-default-respin]
+[rawhide-ppc64-live-desktop-respin]
description = Fedora Unity Live Desktop Re-Spin Model for Fedora rawhide
main = /etc/revisor-unity/conf.d/revisor-rawhide-ppc64-live-desktop-respin.conf
iso_basename = Fedora-Unity-Desktop-$datestamp
iso_label = FU Live $datestamp
architecture = ppc64
-kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-desktop-default.ks
+kickstart_file = /usr/share/spin-kickstarts/fedora-livecd-desktop.ks
[rawhide-ppc64-live-desktop-de_CH-respin]
description = Fedora Unity Live Desktop de_CH Re-Spin Model for Fedora rawhide
15 years, 2 months
unity/scripts
by Jeroen van Meeuwen
unity/scripts/respin.sh | 33 ++++++++++-----------------------
1 file changed, 10 insertions(+), 23 deletions(-)
New commits:
commit 80ad40f24c02bddd0b7741756dde6942ba74bb4b
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Sun Mar 8 01:26:05 2009 +0100
Fix up the respin script some more
diff --git a/unity/scripts/respin.sh b/unity/scripts/respin.sh
index 6fc4c02..d4a018a 100755
--- a/unity/scripts/respin.sh
+++ b/unity/scripts/respin.sh
@@ -44,6 +44,9 @@ NOTIFICATION_FAILURE="test-team(a)lists.fedoraunity.org"
NOTIFICATION_SUCCESS="test-team(a)lists.fedoraunity.org"
NOTIFICATION_FROMADD="kanarip(a)kanarip.com"
+GIT_SPINKICKSTARTS=git://git.kanarip.com/spin-kickstarts
+GIT_REVISOR=git://git.kanarip.com/revisor
+
# The temp directory to use. Defaults to /tmp
#TMPDIR=/tmp
@@ -174,24 +177,13 @@ done
##
if [ -z "`rpm -qv revisor-cli | grep -v 'not installed'`" ]; then
- if [ "$0" != "${TMPDIR:-/tmp}/revisor/unity/scripts/respin.sh" ]; then
- if [ -d ${TMPDIR:-/tmp}/revisor ]; then
- cd ${TMPDIR:-/tmp}/revisor
- git checkout master
- git pull git://git.fedorahosted.org/revisor master
- else
- git clone git://git.fedorahosted.org/revisor ${TMPDIR:-/tmp}/revisor
- cd ${TMPDIR:-/tmp}/revisor
- fi
- else
- cd ${TMPDIR:-/tmp}/revisor
- fi
-
+ [ -d "${TMPDIR:-/tmp}/revisor" ] && rm -rf ${TMPDIR:-/tmp}/revisor
+ git clone ${GIT_REVISOR} ${TMPDIR:-/tmp}/revisor
+ cd ${TMPDIR:-/tmp}/revisor/
autoreconf -v && ./configure
./switchhere --yes
revisor_cmd="sudo ./revisor.py --cli"
revisor_cwd="${TMPDIR:-/tmp}/revisor/"
-
else
revisor_cmd="sudo revisor"
revisor_cwd="${TMPDIR:-/tmp}/"
@@ -206,13 +198,8 @@ fi
MESSAGE_END="\\n\\nThe size of the iso image is: %b.\\n\\nGo to http://$WEB_HOSTNAME/revisor/%b/%b/ for more details.\\n\\nKind regards,\\n\\nJeroen van Meeuwen\\n-kanarip"
# Cheat our way through spin-kickstarts
-if [ -d ${TMPDIR:-/tmp}/spin-kickstarts ]; then
- cd ${TMPDIR:-/tmp}/spin-kickstarts
- git checkout master
- git pull git://git.fedorahosted.org/spin-kickstarts.git master
-else
- git clone git://git.fedorahosted.org/spin-kickstarts.git ${TMPDIR:-/tmp}/spin-kickstarts
-fi
+[ -d ${TMPDIR:-/tmp}/spin-kickstarts ] && rm -rf ${TMPDIR:-/tmp}/spin-kickstarts
+git clone ${GIT_SPINKICKSTARTS} ${TMPDIR:-/tmp}/spin-kickstarts
for version in ${VERSIONS}; do
@@ -256,7 +243,7 @@ for version in ${VERSIONS}; do
[ $LIVE_LOCALIZED -eq 1 ] && \
spins=`${revisor_cmd} --config /etc/revisor-unity/${real_version}-live-respin.conf --list-models | grep "^ ${real_version}-${arch}-" | awk '{print $1}'` || \
- spins=`${revisor_cmd} --config /etc/revisor-unity/${real_version}-live-respin.conf --list-models | grep "^ ${real_version}-${arch}-" | awk '{print $1}' | grep -v _`
+ spins=`${revisor_cmd} --config /etc/revisor-unity/${real_version}-live-respin.conf --list-models | grep "^ ${real_version}-${arch}-" | awk '{print $1}' | grep -vE '[[:alpha:]]{2}_[[:alpha:]]{2}'`
for spin in $spins; do
@@ -409,7 +396,7 @@ for version in ${VERSIONS}; do
mock -v -r fedora-$version-$arch clean > revisor-${real_version}-$arch-respin.log 2>&1 && \
mock -v -r fedora-$version-$arch init >> revisor-${real_version}-$arch-respin.log 2>&1 && \
mock -v -r fedora-$version-$arch install $revisor_deps >> revisor-${real_version}-$arch-respin.log 2>&1 && \
- echo -en "git clone git://git.fedorahosted.org/revisor; \\
+ echo -en "git clone ${GIT_REVISOR}; \\
cd /revisor; autoreconf && ./configure; \\
./switchhere --yes; \\
find /var/lib/rpm/ -name '__db.*' -delete; \\
15 years, 2 months
unity/scripts
by Jeroen van Meeuwen
unity/scripts/respin.sh | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
New commits:
commit a2deb7c99904d6f802509770392ac0bc9eef9ce9
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Sun Mar 8 01:08:11 2009 +0100
Fix excluding the localized spins
diff --git a/unity/scripts/respin.sh b/unity/scripts/respin.sh
index e6dbb62..6fc4c02 100755
--- a/unity/scripts/respin.sh
+++ b/unity/scripts/respin.sh
@@ -174,12 +174,16 @@ done
##
if [ -z "`rpm -qv revisor-cli | grep -v 'not installed'`" ]; then
- if [ -d ${TMPDIR:-/tmp}/revisor ]; then
- cd ${TMPDIR:-/tmp}/revisor
- git checkout master
- git pull git://git.fedorahosted.org/revisor master
+ if [ "$0" != "${TMPDIR:-/tmp}/revisor/unity/scripts/respin.sh" ]; then
+ if [ -d ${TMPDIR:-/tmp}/revisor ]; then
+ cd ${TMPDIR:-/tmp}/revisor
+ git checkout master
+ git pull git://git.fedorahosted.org/revisor master
+ else
+ git clone git://git.fedorahosted.org/revisor ${TMPDIR:-/tmp}/revisor
+ cd ${TMPDIR:-/tmp}/revisor
+ fi
else
- git clone git://git.fedorahosted.org/revisor ${TMPDIR:-/tmp}/revisor
cd ${TMPDIR:-/tmp}/revisor
fi
@@ -252,7 +256,7 @@ for version in ${VERSIONS}; do
[ $LIVE_LOCALIZED -eq 1 ] && \
spins=`${revisor_cmd} --config /etc/revisor-unity/${real_version}-live-respin.conf --list-models | grep "^ ${real_version}-${arch}-" | awk '{print $1}'` || \
- spins=`${revisor_cmd} --config /etc/revisor-unity/${real_version}-live-respin.conf --list-models | grep "^ ${real_version}-${arch}-" | awk '{print $1}' | grep -vE ".*??_??.*"`
+ spins=`${revisor_cmd} --config /etc/revisor-unity/${real_version}-live-respin.conf --list-models | grep "^ ${real_version}-${arch}-" | awk '{print $1}' | grep -v _`
for spin in $spins; do
15 years, 2 months
unity/scripts
by Jeroen van Meeuwen
unity/scripts/respin.sh | 80 ++++++++++++++++++++++++++++++++++++++++--------
1 file changed, 68 insertions(+), 12 deletions(-)
New commits:
commit e7bc4214bdfb9cb12edac8813c4f9a94213e1814
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Sun Mar 8 00:51:42 2009 +0100
Enhance the script to optionally include localized spins
Touch a $spin.failed or $spin.success depending on whether the spin succeeded or not
Show the diff for a longer period of time, not just one day
diff --git a/unity/scripts/respin.sh b/unity/scripts/respin.sh
index de07b5a..e6dbb62 100755
--- a/unity/scripts/respin.sh
+++ b/unity/scripts/respin.sh
@@ -83,6 +83,7 @@ revisor_deps="comps-extras createrepo rhpl pykickstart livecd-tools
##
LIVE=0
+LIVE_LOCALIZED=0
INSTALL=0
JUST_LIST=0
cleanup=1
@@ -97,6 +98,12 @@ while [ $# -gt 0 ]; do
LIVE=1
shift
;;
+
+ --live-localized)
+ LIVE_LOCALIZED=1
+ shift
+ ;;
+
--install)
INSTALL=1
shift
@@ -106,6 +113,7 @@ while [ $# -gt 0 ]; do
VERSIONS="${VERSIONS} $2"
shift; shift
;;
+
--arch)
ARCHES="$ARCHES $2"
shift; shift
@@ -241,7 +249,12 @@ for version in ${VERSIONS}; do
# Loop through the available models in the /etc/revisor-unity/*-live-respin.conf
# file, and make sure we only get the models that are the architecture we are running for
# during this loop.
- for spin in `${revisor_cmd} --config /etc/revisor-unity/${real_version}-live-respin.conf --list-models | grep "^ ${real_version}-${arch}-" | awk '{print $1}'`; do
+
+ [ $LIVE_LOCALIZED -eq 1 ] && \
+ spins=`${revisor_cmd} --config /etc/revisor-unity/${real_version}-live-respin.conf --list-models | grep "^ ${real_version}-${arch}-" | awk '{print $1}'` || \
+ spins=`${revisor_cmd} --config /etc/revisor-unity/${real_version}-live-respin.conf --list-models | grep "^ ${real_version}-${arch}-" | awk '{print $1}' | grep -vE ".*??_??.*"`
+
+ for spin in $spins; do
# If we're just listing what we were about to spin, echo and continue
[ $JUST_LIST -eq 1 ] && echo $spin && continue
@@ -271,17 +284,21 @@ for version in ${VERSIONS}; do
[ ! -z "$isoimage" ] && isosize=`ls -lh $isoimage | awk '{print $5}'` || isosize="0M"
- [ $retval -gt 0 ] && \
+ if [ $retval -gt 0 ]; then
printf "Spin $spin failed, log file attached.$MESSAGE_END" "N/A" "$datestamp" "$spin" \
| mail -s "[respin] $spin $datestamp failed" \
-a revisor-$spin.log \
-r $NOTIFICATION_FROMADD \
- -c $NOTIFICATION_FAILURE $NOTIFICATION_SUCCESS || \
+ -c $NOTIFICATION_FAILURE $NOTIFICATION_SUCCESS
+ sudo touch ${REVISORDIR}/$datestamp/$spin.failed
+ else
printf "Spin $spin succeeded, log file attached.$MESSAGE_END" "$isosize" "$datestamp" "$spin" \
| mail -s "[respin] $spin $datestamp succeeded" \
-a revisor-$spin.log \
-r $NOTIFICATION_FROMADD \
$NOTIFICATION_SUCCESS
+ sudo touch ${REVISORDIR}/$datestamp/$spin.success
+ fi
sudo mkdir -p ${REVISORDIR}/$datestamp/$spin/log/
sudo mv revisor-$spin.log ${REVISORDIR}/$datestamp/$spin/log/
@@ -299,13 +316,48 @@ for version in ${VERSIONS}; do
sudo umount ${TMPDIR:-/tmp}/loopmount_iso
# Now that we have today's spin, if we have yesterday's spin, we can compare
- yesterday=`date --date=yesterday +"%Y%m%d"`
- rpms_log_yesterday=`find ${REVISORDIR}/$yesterday/$spin/log/ -name "rpms-*.log" 2>/dev/null`
- rpms_log_today=`find ${REVISORDIR}/$datestamp/$spin/log/ -name "rpms-*.log" 2>/dev/null`
- if [ ! -z "$rpms_log_yesterday" -a ! -z "$rpms_log_today" ]; then
- `pwd`/unity/scripts/live-respin-size-diff.py $rpms_log_yesterday $rpms_log_today > rpms-diff-$yesterday-$datestamp.log && \
- sudo mv rpms-diff-$yesterday-$datestamp.log ${REVISORDIR}/$datestamp/$spin/log/
- fi
+ #
+ # Go back four weeks and generate the diffs
+ declare -a days
+ days[0]=`date --date="28 days ago" +"%Y%m%d"`
+ days[1]=`date --date="27 days ago" +"%Y%m%d"`
+ days[2]=`date --date="26 days ago" +"%Y%m%d"`
+ days[3]=`date --date="25 days ago" +"%Y%m%d"`
+ days[4]=`date --date="24 days ago" +"%Y%m%d"`
+ days[5]=`date --date="23 days ago" +"%Y%m%d"`
+ days[6]=`date --date="22 days ago" +"%Y%m%d"`
+ days[7]=`date --date="21 days ago" +"%Y%m%d"`
+ days[8]=`date --date="20 days ago" +"%Y%m%d"`
+ days[9]=`date --date="19 days ago" +"%Y%m%d"`
+ days[10]=`date --date="18 days ago" +"%Y%m%d"`
+ days[11]=`date --date="17 days ago" +"%Y%m%d"`
+ days[12]=`date --date="16 days ago" +"%Y%m%d"`
+ days[13]=`date --date="15 days ago" +"%Y%m%d"`
+ days[14]=`date --date="14 days ago" +"%Y%m%d"`
+ days[15]=`date --date="13 days ago" +"%Y%m%d"`
+ days[16]=`date --date="12 days ago" +"%Y%m%d"`
+ days[17]=`date --date="11 days ago" +"%Y%m%d"`
+ days[18]=`date --date="10 days ago" +"%Y%m%d"`
+ days[19]=`date --date="9 days ago" +"%Y%m%d"`
+ days[20]=`date --date="8 days ago" +"%Y%m%d"`
+ days[21]=`date --date="7 days ago" +"%Y%m%d"`
+ days[22]=`date --date="6 days ago" +"%Y%m%d"`
+ days[23]=`date --date="5 days ago" +"%Y%m%d"`
+ days[24]=`date --date="4 days ago" +"%Y%m%d"`
+ days[25]=`date --date="3 days ago" +"%Y%m%d"`
+ days[26]=`date --date="2 days ago" +"%Y%m%d"`
+ days[27]=`date --date="1 days ago" +"%Y%m%d"`
+
+ i=0
+ while [ $i -lt ${#days[@]} ]; do
+ rpms_log_history=`find ${REVISORDIR}/${days[$i]}/$spin/log/ -name "rpms-*.log" 2>/dev/null`
+ rpms_log_today=`find ${REVISORDIR}/$datestamp/$spin/log/ -name "rpms-*.log" 2>/dev/null`
+ if [ ! -z "$rpms_log_history" -a ! -z "$rpms_log_today" ]; then
+ `pwd`/unity/scripts/live-respin-size-diff.py $rpms_log_history $rpms_log_today > rpms-diff-${days[$i]}-$datestamp.log && \
+ sudo mv rpms-diff-${days[$i]}-$datestamp.log ${REVISORDIR}/$datestamp/$spin/log/
+ fi
+ i=$[ $i + 1 ]
+ done
# Make some torrents
spin_name=`echo $(basename $isoimage) | sed -e 's/.iso//g'`
@@ -364,17 +416,21 @@ for version in ${VERSIONS}; do
retval=$?
- [ $retval -gt 0 ] && \
+ if [ $retval -gt 0 ]; then
printf "Spin ${real_version}-$arch-respin failed, log file attached.$MESSAGE_END" "N/A" "$datestamp" "${real_version}-$arch-respin" \
| mail -s "[respin] ${real_version}-$arch-respin $datestamp failed" \
-a revisor-${real_version}-$arch-respin.log \
-r $NOTIFICATION_FROMADD \
- -c $NOTIFICATION_FAILURE $NOTIFICATION_SUCCESS || \
+ -c $NOTIFICATION_FAILURE $NOTIFICATION_SUCCESS
+ sudo touch ${REVISORDIR}/$datestamp/${real_version}-$arch-respin.failed
+ else
printf "Spin ${real_version}-$arch-respin succeeded, log file attached.$MESSAGE_END" "N/A" "$datestamp" "${real_version}-$arch-respin" \
| mail -s "[respin] ${real_version}-$arch-respin $datestamp succeeded" \
-a revisor-${real_version}-$arch-respin.log \
-r $NOTIFICATION_FROMADD \
$NOTIFICATION_SUCCESS
+ sudo touch ${REVISORDIR}/$datestamp/${real_version}-$arch-respin.success
+ fi
sudo mkdir -p ${REVISORDIR}/$datestamp/${real_version}-$arch-respin/log/
sudo mv revisor-${real_version}-$arch-respin.log ${REVISORDIR}/$datestamp/${real_version}-$arch-respin/log/
15 years, 2 months
unity/scripts
by Jeroen van Meeuwen
unity/scripts/respin.sh | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
New commits:
commit 8b4593a903aa5c7e313e40e360a4092a431e56e7
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Fri Mar 6 13:40:43 2009 +0100
Copy local files (symbolic links don't help)
diff --git a/unity/scripts/respin.sh b/unity/scripts/respin.sh
index 59d3869..de07b5a 100755
--- a/unity/scripts/respin.sh
+++ b/unity/scripts/respin.sh
@@ -261,7 +261,7 @@ for version in ${VERSIONS}; do
${revisor_cmd} --config /etc/revisor-unity/${real_version}-live-respin.conf \
--model $spin --debug 9 --clean-up $cleanup \
--destination-directory ${REVISORDIR}/$datestamp/ \
- --report-sizes > revisor-$spin.log 2>&1
+ --report-sizes --copy-local > revisor-$spin.log 2>&1
retval=$?
@@ -354,13 +354,13 @@ for version in ${VERSIONS}; do
mock -v -r fedora-$version-$arch init >> revisor-${real_version}-$arch-respin.log 2>&1 && \
mock -v -r fedora-$version-$arch install $revisor_deps >> revisor-${real_version}-$arch-respin.log 2>&1 && \
echo -en "git clone git://git.fedorahosted.org/revisor; \\
- cd /revisor; autoreconf && ./configure; \\
- ./switchhere --yes; \\
- find /var/lib/rpm/ -name '__db.*' -delete; \\
- ./revisor.py --cli --config unity/conf/${real_version}-install-respin.conf \\
- --destination-directory ${REVISORDIR}/$datestamp/ \\
- --model ${real_version}-$arch-respin --debug 9 \\
- --clean-up $cleanup\n" | mock -v -r fedora-$version-$arch shell >> revisor-${real_version}-$arch-respin.log 2>&1
+ cd /revisor; autoreconf && ./configure; \\
+ ./switchhere --yes; \\
+ find /var/lib/rpm/ -name '__db.*' -delete; \\
+ ./revisor.py --cli --config unity/conf/${real_version}-install-respin.conf \\
+ --destination-directory ${REVISORDIR}/$datestamp/ \\
+ --model ${real_version}-$arch-respin --copy-local --debug 9 \\
+ --clean-up $cleanup\n" | mock -v -r fedora-$version-$arch shell >> revisor-${real_version}-$arch-respin.log 2>&1
retval=$?
15 years, 2 months
unity/scripts
by Jeroen van Meeuwen
unity/scripts/respin.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 91b23f302a0829c2794311d319b7fb0db6e2ce99
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Fri Mar 6 13:23:39 2009 +0100
Give the message_end the right number of strings to substitute
diff --git a/unity/scripts/respin.sh b/unity/scripts/respin.sh
index 466be7d..59d3869 100755
--- a/unity/scripts/respin.sh
+++ b/unity/scripts/respin.sh
@@ -365,12 +365,12 @@ for version in ${VERSIONS}; do
retval=$?
[ $retval -gt 0 ] && \
- printf "Spin ${real_version}-$arch-respin failed, log file attached.$MESSAGE_END" "$datestamp" "${real_version}-$arch-respin" \
+ printf "Spin ${real_version}-$arch-respin failed, log file attached.$MESSAGE_END" "N/A" "$datestamp" "${real_version}-$arch-respin" \
| mail -s "[respin] ${real_version}-$arch-respin $datestamp failed" \
-a revisor-${real_version}-$arch-respin.log \
-r $NOTIFICATION_FROMADD \
-c $NOTIFICATION_FAILURE $NOTIFICATION_SUCCESS || \
- printf "Spin ${real_version}-$arch-respin succeeded, log file attached.$MESSAGE_END" "$datestamp" "${real_version}-$arch-respin" \
+ printf "Spin ${real_version}-$arch-respin succeeded, log file attached.$MESSAGE_END" "N/A" "$datestamp" "${real_version}-$arch-respin" \
| mail -s "[respin] ${real_version}-$arch-respin $datestamp succeeded" \
-a revisor-${real_version}-$arch-respin.log \
-r $NOTIFICATION_FROMADD \
15 years, 2 months