From ce1031681efc56b805c837453a549772df64d074 Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Thu, 28 Jan 2010 14:13:00 +0000 Subject: [PATCH] fix broken yum repo generation --- nodeconfig/yum/myplc.repo.php | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/nodeconfig/yum/myplc.repo.php b/nodeconfig/yum/myplc.repo.php index a0e8d28..e26287d 100644 --- a/nodeconfig/yum/myplc.repo.php +++ b/nodeconfig/yum/myplc.repo.php @@ -5,7 +5,8 @@ // Thierry Parmentelat // Copyright (C) 2008 INRIA // -// $Id: myplc.repo.php 9818 2008-07-04 07:54:06Z thierry $ +// $Id$ +// $URL$ // // For PLC_NAME and PLC_BOOT_HOST @@ -24,12 +25,15 @@ if (isset($_REQUEST['gpgcheck'])) { $gpgcheck = 0; } +echo "# Generated by myplc.repo.php\n"; +echo '# $Id$' . "\n"; +echo '# $URL$' . "\n"; # we assume the node is not so old that it would not send node_id # get node family if ( ! isset($_REQUEST['node_id'])) { - echo "# myplc.repo.php: node_id is needed"; - echo "# looks like you're running a very old NodeManager..."; - echo "# bailing out.."; + echo "# node_id is needed\n"; + echo "# looks like you're running a very old NodeManager...\n"; + echo "# bailing out..\n"; exit; } @@ -40,13 +44,17 @@ $nodefamily=$nodeflavour['nodefamily']; $topdir=$_SERVER['DOCUMENT_ROOT'] . "/install-rpms/" . $nodefamily; $topurl="https://$PLC_BOOT_HOST" . "/install-rpms/" . $nodefamily; -if (! is_dir (realpath($topdir))) { - echo "# WARNING: plc-side yum repo $topdir NOT FOUND !!"; - } +if ( is_dir (realpath($topdir))) { + echo "# This directory was checked to exist on the server-side\n"; +} else{ + echo "# WARNING: plc-side yum repo $topdir NOT FOUND !!\n"; +} +$repo_id=$nodefamily; +$repo_name="$PLC_NAME $nodefamily"; echo <<< __PLC_REPO__ -[$id] -name=$name +[$repo_id] +name=$repo_name baseurl=$topurl gpgcheck=$gpgcheck -- 2.43.0