This patch makes buildinstall accept multiple repo arguments. This is useful when, say, you have a couple of packages that haven't hit rawhide yet, but you want to test them in the installer.
./buildinstall ... http://rawhide... /home/wwoods/myrepo or make testiso REPO="http://rawhide... /home/wwoods/myrepo"
-w
(sorry if this message shows up a couple of times.. still figuring out how to use git-format-patch and git-send-email) --- scripts/buildinstall | 22 +++++++++++++++++++++- 1 files changed, 21 insertions(+), 1 deletions(-)
diff --git a/scripts/buildinstall b/scripts/buildinstall index a5001a9..4c71e16 100755 --- a/scripts/buildinstall +++ b/scripts/buildinstall @@ -69,7 +69,11 @@ while [ $# -gt 0 ]; do ;;
*) - REPO=$1 + if [ -z "$REPO" ]; then + REPO=$1 + else + EXTRA_REPOS="$EXTRA_REPOS $1" + fi shift ;; esac @@ -123,6 +127,22 @@ baseurl=$REPO enabled=1 EOF
+n=1 +for r in $EXTRA_REPOS; do + if [[ $r =~ ^/ ]]; then + r="file://$r" + fi + cat >> $yumconf <<EOF + +[anaconda-extrarepo-$n] +name=anaconda extra repo $n +baseurl=$r +enabled=1 +EOF + let n++ +done + + BUILDINSTDIR=`mktemp -d ${TMPDIR:-/tmp}/buildinstall.tree.XXXXXX` TREEDIR=`mktemp -d ${TMPDIR:-/tmp}/treedir.XXXXXX`
On Thu, 2008-04-24 at 18:00 -0400, Will Woods wrote:
This patch makes buildinstall accept multiple repo arguments. This is useful when, say, you have a couple of packages that haven't hit rawhide yet, but you want to test them in the installer.
This was something I was going to look at for post F9 :-) Looks reasonable, will apply after we've branched
Jeremy
On Thu, 2008-04-24 at 22:24 -0400, Jeremy Katz wrote:
On Thu, 2008-04-24 at 18:00 -0400, Will Woods wrote:
This patch makes buildinstall accept multiple repo arguments. This is useful when, say, you have a couple of packages that haven't hit rawhide yet, but you want to test them in the installer.
This was something I was going to look at for post F9 :-) Looks reasonable, will apply after we've branched
Yeah, it could have waited but I needed it to test a couple of blocker fixes. Standard freeze-time chicken-and-egg problem: we don't want to tag the package unless the fix is confirmed, but we can't confirm the fix until the package is tagged and built into rawhide..
Anyway, merging post-F9 is fine. I'll keep it in my anaconda branch 'til then.
-w
On Fri, 2008-04-25 at 11:10 -0400, Will Woods wrote:
On Thu, 2008-04-24 at 22:24 -0400, Jeremy Katz wrote:
On Thu, 2008-04-24 at 18:00 -0400, Will Woods wrote:
This patch makes buildinstall accept multiple repo arguments. This is useful when, say, you have a couple of packages that haven't hit rawhide yet, but you want to test them in the installer.
This was something I was going to look at for post F9 :-) Looks reasonable, will apply after we've branched
Yeah, it could have waited but I needed it to test a couple of blocker fixes. Standard freeze-time chicken-and-egg problem: we don't want to tag the package unless the fix is confirmed, but we can't confirm the fix until the package is tagged and built into rawhide..
Anyway, merging post-F9 is fine. I'll keep it in my anaconda branch 'til then.
And applied to master now
Jeremy
anaconda-devel@lists.stg.fedoraproject.org