[dh-r] 02/43: Chomp all the things

[Gordon Ball]

This is an automated email from the git hooks/post-receive script.

chronitis-guest pushed a commit to branch master
in repository dh-r.

commit 9cc903b8e505a803a9f8b6e3525f86d87d239d20
Author: Gordon Ball <gordon at chronitis.net>
Date:   Thu Sep 1 16:48:15 2016 +0200

    Chomp all the things
---
 dh/R.pm | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/dh/R.pm b/dh/R.pm
index 936523a..c52be7e 100644
--- a/dh/R.pm
+++ b/dh/R.pm
@@ -69,13 +69,13 @@ sub install {
     # it would be nice to use Dpkg::Control::Info here since the
     # format is the same, but we can't because it checks the first
     # block contains Source: and errors when it doesn't
-    my $rpackage = qx/grep-dctrl -s Package -n . DESCRIPTION/;
-    my $rversion = qx/grep-dctrl -s Version -n . DESCRIPTION/;
+    chomp(my $rpackage = qx/grep-dctrl -s Package -n . DESCRIPTION/);
+    chomp(my $rversion = qx/grep-dctrl -s Version -n . DESCRIPTION/);
 
     say "I: R Package: $rpackage Version: $rversion";
 
     # Priority: Recommended should go in /library instead of /site-library
-    my $rpriority = qx/grep-dctrl -s Priority -n . DESCRIPTION/;
+    chomp(my $rpriority = qx/grep-dctrl -s Priority -n . DESCRIPTION/);
 
     my $libdir = "usr/lib/R/site-library";
     if ($rpriority eq "Recommended") {
@@ -85,11 +85,11 @@ sub install {
 
     # this appears to be set ("CRAN") for packages originating from CRAN,
     # but is not set for bioconductor, nor for packages direct from upstream
-    my $rrepo = qx/grep-dctrl -s Repository -n . DESCRIPTION/;
+    chomp(my $rrepo = qx/grep-dctrl -s Repository -n . DESCRIPTION/);
 
     # however, biocViews is (presumably) only going to be set for bioconductor
     # packages, so nonzero should identify
-    my $rbiocviews = qx/grep-dctrl -s biocViews -n . DESCRIPTION/;
+    chomp(my $rbiocviews = qx/grep-dctrl -s biocViews -n . DESCRIPTION/);
 
     my $srcctrl = Dpkg::Control::Info->new()->get_source();
 
@@ -119,13 +119,13 @@ sub install {
     my $debname = "r-" . lc($repo) . "-" . lc($rpackage);
     say "I: Using debian package name: $debname";
 
-    my $rpkgversion = qx/dpkg-query -W -f='\${Version}' r-base-dev/;
+    chomp(my $rpkgversion = qx/dpkg-query -W -f='\${Version}' r-base-dev/);
     say "I: Building using R version $rpkgversion";
 
-    my $rapiversion = qx/dpkg-query -W -f='\${Provides}' r-base-core | grep -o 'r-api[^, ]*'/;
+    chomp(my $rapiversion = qx/dpkg-query -W -f='\${Provides}' r-base-core | grep -o 'r-api[^, ]*'/);
     say "I: R API version: $rapiversion";
 
-    my $builttime = qx/dpkg-parsechangelog | grep-dctrl -s Date -n ./;
+    chomp(my $builttime = qx/dpkg-parsechangelog | grep-dctrl -s Date -n ./);
     say "I: Using built-time from d/changelog: $builttime";
 
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/dh-r.git