All of lore.kernel.org
 help / color / mirror / Atom feed
From: Ian Jackson <ian.jackson@eu.citrix.com>
To: xen-devel@lists.xenproject.org
Cc: Ian Jackson <Ian.Jackson@eu.citrix.com>,
	Ian Campbell <ian.campbell@citrix.com>
Subject: [OSSTEST PATCH 3/9] config: Tiny fixes
Date: Tue, 17 Feb 2015 17:50:25 +0000	[thread overview]
Message-ID: <1424195431-1493-4-git-send-email-ian.jackson@eu.citrix.com> (raw)
In-Reply-To: <1424195431-1493-1-git-send-email-ian.jackson@eu.citrix.com>

* Default $c{DebianPreseed} to '' (previously, if it wasn't specified,
  there would be undefined variable warnings).

* Cope with empty <<END-notated config items in the configuration file
  parser.

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
---
 Osstest.pm |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Osstest.pm b/Osstest.pm
index fc9698b..6d7c083 100644
--- a/Osstest.pm
+++ b/Osstest.pm
@@ -74,6 +74,8 @@ our %c = qw(
     DebianNonfreeFirmware firmware-bnx2
 );
 
+$c{DebianPreseed} = '';
+
 #---------- general setup and config reading ----------
 
 sub getmethod {
@@ -120,7 +122,7 @@ sub readglobalconfig () {
 			$val .= $_;
 		    }
 		    die $! unless length $_;
-		    die unless $val =~ m/\n$/;
+		    die unless !length $val || $val =~ m/\n$/;
 		    if ($qu eq '') {
 			my $reconstruct =
 			    "\$val = <<${qu}${delim}${qu}; 1;\n".
-- 
1.7.10.4

  parent reply	other threads:[~2015-02-17 18:03 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-02-17 17:50 [OSSTEST PATCH 0/9] Fix NTP unreliability, and other fixes Ian Jackson
2015-02-17 17:50 ` [OSSTEST PATCH 1/9] cs-adjust-flight: Add missing `use Data::Dumper' Ian Jackson
2015-02-17 17:50 ` [OSSTEST PATCH 2/9] sg-report-job-history: Increase default history depth to 500 Ian Jackson
2015-02-17 17:50 ` Ian Jackson [this message]
2015-02-17 17:50 ` [OSSTEST PATCH 4/9] TestSupport: Provide get_target_property Ian Jackson
2015-02-17 17:50 ` [OSSTEST PATCH 5/9] Debian.pm: Pass $ho/$gho to preseed_base Ian Jackson
2015-02-17 17:50 ` [OSSTEST PATCH 6/9] Debian.pm: Slightly refactor preseed_base Ian Jackson
2015-02-17 17:50 ` [OSSTEST PATCH 7/9] NTP servers: Introduce new NtpServer host property Ian Jackson
2015-02-17 17:50 ` [OSSTEST PATCH 8/9] NTP servers: Use " Ian Jackson
2015-02-17 17:50 ` [OSSTEST PATCH 9/9] NTP servers: Work around Debian's failure to honour preseed Ian Jackson

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1424195431-1493-4-git-send-email-ian.jackson@eu.citrix.com \
    --to=ian.jackson@eu.citrix.com \
    --cc=ian.campbell@citrix.com \
    --cc=xen-devel@lists.xenproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.