conf/conf.d/revisor-f11-i386.conf | 2 +-
conf/conf.d/revisor-f11-ppc.conf | 2 +-
conf/conf.d/revisor-f11-ppc64.conf | 2 +-
conf/conf.d/revisor-f11-x86_64.conf | 2 +-
revisor/pungi.py | 4 ++--
scripts/F11-buildinstall | 4 +---
6 files changed, 7 insertions(+), 9 deletions(-)
New commits:
commit 87521f7a29aad45c3f43140323d548e3ad89e1c3
Merge: 3b04cd8... 2813792...
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Tue Jul 7 16:28:41 2009 +0200
Merge branch 'master' of
ssh://git.fedorahosted.org/git/revisor
commit 3b04cd8fa4fe0fcfe02ae6c1a7e26924e975b68d
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Tue Jul 7 16:27:58 2009 +0200
Update the release name
diff --git a/conf/conf.d/revisor-f11-i386.conf b/conf/conf.d/revisor-f11-i386.conf
index 9bc3cb5..1db58fe 100644
--- a/conf/conf.d/revisor-f11-i386.conf
+++ b/conf/conf.d/revisor-f11-i386.conf
@@ -23,7 +23,7 @@ enabled=1
gpgcheck=0
[fedora-debuginfo]
-name=Fedora 11 - Werewolf - Debug - i386
+name=Fedora 11 - Leonidas - Debug - i386
baseurl=http://download.fedoraproject.org/pub/fedora/linux/releases/11/Ev...
mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-debug-...
enabled=0
diff --git a/conf/conf.d/revisor-f11-ppc.conf b/conf/conf.d/revisor-f11-ppc.conf
index 788347c..3a625bf 100644
--- a/conf/conf.d/revisor-f11-ppc.conf
+++ b/conf/conf.d/revisor-f11-ppc.conf
@@ -23,7 +23,7 @@ enabled=1
gpgcheck=0
[fedora-debuginfo]
-name=Fedora 11 - Werewolf - Debug - ppc
+name=Fedora 11 - Leonidas - Debug - ppc
baseurl=http://download.fedoraproject.org/pub/fedora/linux/releases/11/Ev...
mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-debug-...
enabled=0
diff --git a/conf/conf.d/revisor-f11-ppc64.conf b/conf/conf.d/revisor-f11-ppc64.conf
index ca45f8b..5a6dd3f 100644
--- a/conf/conf.d/revisor-f11-ppc64.conf
+++ b/conf/conf.d/revisor-f11-ppc64.conf
@@ -23,7 +23,7 @@ enabled=1
gpgcheck=0
[fedora-debuginfo]
-name=Fedora 11 - Werewolf - Debug - ppc64
+name=Fedora 11 - Leonidas - Debug - ppc64
baseurl=http://download.fedoraproject.org/pub/fedora/linux/releases/11/Ev...
mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-debug-...
enabled=0
diff --git a/conf/conf.d/revisor-f11-x86_64.conf b/conf/conf.d/revisor-f11-x86_64.conf
index 2e0acc1..9e0819b 100644
--- a/conf/conf.d/revisor-f11-x86_64.conf
+++ b/conf/conf.d/revisor-f11-x86_64.conf
@@ -23,7 +23,7 @@ enabled=1
gpgcheck=0
[fedora-debuginfo]
-name=Fedora 11 - Werewolf - Debug - x86_64
+name=Fedora 11 - Leonidas - Debug - x86_64
baseurl=http://download.fedoraproject.org/pub/fedora/linux/releases/11/Ev...
mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-debug-...
enabled=0
commit 186e061bf8dbb80609989db8359f13a8768e9ec4
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Mon Jul 6 22:43:14 2009 +0200
--debug 9 now executes buildinstall through bash -x
diff --git a/revisor/pungi.py b/revisor/pungi.py
index 18f23ff..a313791 100644
--- a/revisor/pungi.py
+++ b/revisor/pungi.py
@@ -261,8 +261,8 @@ cost=500
"""Run anaconda-runtime's buildinstall on the
tree."""
buildinstall = []
- #if self.cfg.debuglevel == 9 and self.cfg.mode_devel:
- #buildinstall.extend(['bash', '-x'])
+ if self.cfg.debuglevel == 9:
+ buildinstall.extend(['bash', '-x'])
# setup the buildinstall call
if os.access("scripts/%s-buildinstall" % self.cfg.version_from,
os.R_OK):
commit 62c2affceff428830803753062255af9350b08e1
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Mon Jul 6 22:42:36 2009 +0200
Update F11-buildinstall
diff --git a/scripts/F11-buildinstall b/scripts/F11-buildinstall
index e2765db..2fc90c2 100755
--- a/scripts/F11-buildinstall
+++ b/scripts/F11-buildinstall
@@ -85,9 +85,7 @@ while [ $# -gt 0 ]; do
if [[ "$1" =~ ^/ ]]; then
# This is the output directory
OUTPUT=$1
- elif [ -z "$REPO" ]; then
- # This is the first repository
- REPO=$1
+ REPO="file://$1"
else
# These are additional repositories
EXTRA_REPOS="$EXTRA_REPOS $1"