revisor/modgui/configuration.py | 4 ++
unity/scripts/respin.sh | 64 ++++++++++++++++++++++++----------------
2 files changed, 43 insertions(+), 25 deletions(-)
New commits:
commit 75e5210a5a5661199c9f655130ef8a6bb83373b7
Merge: b93198c... 3f39a07...
Author: Jeroen van Meeuwen (Fedora Unity) <kana...@fedoraunity.org>
Date: Wed Feb 25 03:54:05 2009 +0100
Merge branch 'master' of ssh://git.fedorahosted.org/git/revisor
commit b93198cd1c3c3c21fce6d8a422e06430d06b077c
Author: Jeroen van Meeuwen (Fedora Unity) <kana...@fedoraunity.org>
Date: Wed Feb 25 03:53:38 2009 +0100
Update respin.sh (again)
diff --git a/unity/scripts/respin.sh b/unity/scripts/respin.sh
index 55ede26..79208bc 100755
--- a/unity/scripts/respin.sh
+++ b/unity/scripts/respin.sh
@@ -120,45 +120,57 @@ done
## If that fails, we'll look for an installed RPM,
## Last but not least, we'll clone stuff ourselves and go at it
##
-if [ -d ~/devel/revisor/master ]; then
- cd ~/devel/revisor/master
- git pull git://git.fedorahosted.org/revisor master
- autoreconf -v && ./configure
- ./switchhere --yes
- revisor_cmd="sudo ./revisor.py --cli"
-elif [ ! -z "`rpm -qv revisor | grep -v 'not installed'`" ]; then
- revisor_cmd="sudo revisor --cli"
+if [ -z "`rpm -qv revisor-cli | grep -v 'not installed'`" ]; then
+ if [ -d /tmp/revisor ]; then
+ cd /tmp/revisor
+ git checkout master
+ git pull git://git.fedorahosted.org/revisor master
+ else
+ git clone git://git.fedorahosted.org/revisor /tmp/revisor
+ cd /tmp/revisor
+ fi
-else
- git clone git://git.fedorahosted.org/revisor /tmp/revisor
- cd /tmp/revisor
autoreconf -v && ./configure
./switchhere --yes
revisor_cmd="sudo ./revisor.py --cli"
+ revisor_cwd="/tmp/revisor/"
+
+else
+ revisor_cmd="sudo revisor"
+ revisor_cwd="/tmp/"
fi
-MESSAGE_END="\\n\\nGo to http://$HOSTNAME/revisor/%b/%b/ for more
details.\\n\\nKind regards,\\n\\nJeroen van Meeuwen\n-kanarip"
+# If we're in the *.kanarip.com network, our webserver is called
www.kanarip.com
+[ -z "`hostname | grep kanarip.com`" ] && WEB_HOSTNAME=$HOSTNAME ||
WEB_HOSTNAME="www.kanarip.com"
+
+MESSAGE_END="\\n\\nGo to http://$WEB_HOSTNAME/revisor/%b/%b/ for more
details.\\n\\nKind regards,\\n\\nJeroen van Meeuwen\n-kanarip"
NOTIFICATION_FAILURE="kana...@kanarip.com"
NOTIFICATION_SUCCESS="kana...@kanarip.com"
NOTIFICATION_FROMADD="kana...@kanarip.com"
# Cheat our way through spin-kickstarts
-[ -d /tmp/spin-kickstarts ] && sudo rm -rf /tmp/spin-kickstarts
-git clone git://git.fedorahosted.org/spin-kickstarts.git /tmp/spin-kickstarts
+if [ -d /tmp/spin-kickstarts ]; then
+ cd /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
/tmp/spin-kickstarts
+fi
for version in $VERSIONS; do
# Build the spin-kickstarts package for this version
ourwd=`pwd`
cd /tmp/spin-kickstarts
- [ ! -z "`git branch -la | grep '^ F-$version'`" ] && git checkout
F-$version || git checkout --track -b F-$version origin/F-$version
+ [ ! -z "`git branch -la | grep \"^ F-$version\"`" ] && git checkout
F-$version || git checkout --track -b F-$version origin/F-$version
autoreconf -v && ./configure --prefix=/usr && sudo make install
- cd $ourwd
for arch in $ARCHES; do
if [ $LIVE -eq 1 ]; then
+ cd ${revisor_cwd}
+
for spin in `${revisor_cmd} --config
/etc/revisor-unity/f$version-live-respin.conf --list-models | grep "^
f$version-$arch-" | awk '{print $1}'`; do
datestamp=`date +'%Y%m%d'`
@@ -198,14 +210,6 @@ for version in $VERSIONS; do
spin_name="f$version-$arch-respin"
- mock -r fedora-$version-$arch clean | tee
revisor-f$version-$arch-respin.log && \
- mock -r fedora-$version-$arch init | tee -a
revisor-f$version-$arch-respin.log && \
- mock -r fedora-$version-$arch install $revisor_deps | tee -a
revisor-f$version-$arch-respin.log && \
- echo -en "git clone git://git.fedorahosted.org/revisor\n" | mock
-r fedora-$version-$arch shell | tee -a revisor-f$version-$arch-respin.log && \
- echo -en "cd /revisor; ./switchhere --yes\n" | mock -r
fedora-$version-$arch shell | tee -a revisor-f$version-$arch-respin.log && \
- echo -en "cd /revisor; autoreconf && ./configure\n" | mock -r
fedora-$version-$arch shell | tee -a revisor-f$version-$arch-respin.log && \
- echo -en "find /var/lib/rpm/ -name '__db.*' -delete\n" | mock -r
fedora-$version-$arch shell | tee -a revisor-f$version-$arch-respin.log && \
-
datestamp=`date +'%Y%m%d'`
# Let's make sure we remove the entire directory before we attempt
a respin.
@@ -213,7 +217,17 @@ for version in $VERSIONS; do
#
sudo rm -rf /srv/revisor/$datestamp/f$version-$arch-respin/log/
- echo -en "cd /revisor; ./revisor.py --cli --config
/etc/revisor-unity/f$version-install-respin.conf --destination-directory
/srv/revisor/$datestamp/ --model f$version-$arch-respin --debug 9 --clean-up
$cleanup\n" | mock -r fedora-$version-$arch shell >>
revisor-f$version-$arch-respin.log 2>&1
+ mock -v -r fedora-$version-$arch clean | tee
revisor-f$version-$arch-respin.log && \
+ mock -v -r fedora-$version-$arch init | tee -a
revisor-f$version-$arch-respin.log && \
+ mock -v -r fedora-$version-$arch install $revisor_deps | tee -a
revisor-f$version-$arch-respin.log && \
+ 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/f$version-install-respin.conf \\
+ --destination-directory /srv/revisor/$datestamp/ \\
+ --model f$version-$arch-respin --debug 9 \\
+ --clean-up $cleanup\n" | mock -v -r fedora-$version-$arch
shell | tee -a revisor-f$version-$arch-respin.log
[ $? -gt 0 ] && \
printf "Spin f$version-$arch-respin failed, log file
attached.$MESSAGE_END" "$datestamp" "f$version-$arch-respin" \
commit 9ca63661e2040ce799495664254908a6b7e4e7ee
Author: Jeroen van Meeuwen (Fedora Unity) <kana...@fedoraunity.org>
Date: Tue Feb 24 17:43:16 2009 +0100
Fix a minor bug in the destination directory when pressing "Back"
diff --git a/revisor/modgui/configuration.py b/revisor/modgui/configuration.py
index 145ef29..7add296 100644
--- a/revisor/modgui/configuration.py
+++ b/revisor/modgui/configuration.py
@@ -406,6 +406,10 @@ class RevisorConfiguration:
widget_rc.set_text(self.cfg.config)
widget_dd =
self.gui.frame_xml.get_widget("entry_destination_directory")
+
+ if self.cfg.model:
+ self.cfg.destination_directory =
self.cfg.destination_directory.replace("/%s" % self.cfg.model,"")
+
widget_dd.set_text(self.cfg.destination_directory)
self.load_models()
_______________________________________________
revisor-devel mailing list
revisor-devel@lists.fedorahosted.org
https://fedorahosted.org/mailman/listinfo/revisor-devel
