[dh-r] 32/43: Remove repo detection logic from R.pm

[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 efff0a74401f0b49ab13365008f4708c70769b4a
Author: Gordon Ball <gordon at chronitis.net>
Date:   Thu Sep 15 11:06:15 2016 +0200

    Remove repo detection logic from R.pm
---
 dh/R.pm | 32 --------------------------------
 1 file changed, 32 deletions(-)

diff --git a/dh/R.pm b/dh/R.pm
index d64f0fb..841fc50 100644
--- a/dh/R.pm
+++ b/dh/R.pm
@@ -37,28 +37,6 @@ sub parse_description {
     return $desc;
 }
 
-sub get_repo {
-    my $desc = shift;
-    my $repo = "CRAN";
-    if (defined $ENV{RREPOSITORY}) {
-        $repo = $ENV{RREPOSITORY};
-        say "I: Using repo=$repo from env RREPOSITORY";
-    } elsif (length $desc->{Repo}) {
-        # this appears to be set ("CRAN") for packages originating from CRAN,
-        # but is not set for bioconductor, nor for packages direct from upstream
-        $repo = $desc->{Repo};
-        say "I: Using repo=$repo from DESCRIPTION::Repository";
-    } elsif (length $desc->{biocViews}) {
-        # however, biocViews is (presumably) only going to be set for bioconductor
-        # packages, so nonzero should identify
-        $repo = "BIOC";
-        say "I: Using repo=$repo due to existence of DESCRIPTION::biocViews";
-    } else {
-        say "I: Using repo=$repo by default";
-    }
-    return $repo;
-}
-
 sub parse_depends {
     # try and convert R package dependencies in DESCRIPTION into a
     # list of debian package dependencies
@@ -126,16 +104,6 @@ sub install {
         say "I: R package with Priority: $desc->{Priority}, installing in $libdir";
     }
 
-    my $repo = get_repo($desc);
-
-
-    # this is used to determine the install directory during build
-    # TODO: check this actually matches the binary name in d/control?
-    my $debname = "r-" . lc($repo) . "-" . lc($desc->{Package});
-    say "I: Using debian package name: $debname";
-    # we don't actually need to know this here since we're already supplied
-    # with the correct destination dir
-
     chomp(my $rbase_version = qx/dpkg-query -W -f='\${Version}' r-base-dev/);
     say "I: Building using R version $rbase_version";
 

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