Mon Jan 13 18:09:20 2020 UTC ()
pkgtools/R2pkg: remove a left-over debug message


(rillig)
diff -r1.28 -r1.29 pkgsrc/pkgtools/R2pkg/files/R2pkg.R
cvs diff -r1.28 -r1.29 pkgsrc/pkgtools/R2pkg/files/R2pkg.R (expand / switch to unified diff)

--- pkgsrc/pkgtools/R2pkg/files/R2pkg.R 2020/01/13 18:06:47 1.28
+++ pkgsrc/pkgtools/R2pkg/files/R2pkg.R 2020/01/13 18:09:20 1.29
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: R2pkg.R,v 1.28 2020/01/13 18:06:47 rillig Exp $ 1# $NetBSD: R2pkg.R,v 1.29 2020/01/13 18:09:20 rillig Exp $
2# 2#
3# Copyright (c) 2014,2015,2016,2017,2018,2019 3# Copyright (c) 2014,2015,2016,2017,2018,2019
4# Brook Milligan. All rights reserved. 4# Brook Milligan. All rights reserved.
5# 5#
6# Redistribution and use in source and binary forms, with or without 6# Redistribution and use in source and binary forms, with or without
7# modification, are permitted provided that the following conditions 7# modification, are permitted provided that the following conditions
8# are met: 8# are met:
9# 1. Redistributions of source code must retain the above copyright 9# 1. Redistributions of source code must retain the above copyright
10# notice, this list of conditions and the following disclaimer. 10# notice, this list of conditions and the following disclaimer.
11# 2. Redistributions in binary form must reproduce the above copyright 11# 2. Redistributions in binary form must reproduce the above copyright
12# notice, this list of conditions and the following disclaimer in the 12# notice, this list of conditions and the following disclaimer in the
13# documentation and/or other materials provided with the distribution. 13# documentation and/or other materials provided with the distribution.
14# 3. Neither the name of the author nor the names of any contributors 14# 3. Neither the name of the author nor the names of any contributors
@@ -342,27 +342,26 @@ make.dependency <- function(s) { @@ -342,27 +342,26 @@ make.dependency <- function(s) {
342} 342}
343 343
344depends <- function(dependency) dependency[1] 344depends <- function(dependency) dependency[1]
345 345
346depends.pkg <- function(dependency) 346depends.pkg <- function(dependency)
347 Sys.glob(paste0('../../*/R-', depends(dependency))) 347 Sys.glob(paste0('../../*/R-', depends(dependency)))
348 348
349new.depends.pkg <- function(dependency) 349new.depends.pkg <- function(dependency)
350 Sys.glob(paste0('../../wip/R-', depends(dependency))) 350 Sys.glob(paste0('../../wip/R-', depends(dependency)))
351 351
352depends.pkg.fullname <- function(dependency, index=1) { 352depends.pkg.fullname <- function(dependency, index=1) {
353 cmd <- sprintf('cd %s && %s show-var VARNAME=PKGNAME', 353 cmd <- sprintf('cd %s && %s show-var VARNAME=PKGNAME',
354 depends.pkg(dependency)[index], arg.make) 354 depends.pkg(dependency)[index], arg.make)
355message(cmd) 
356 system(cmd, intern = TRUE) 355 system(cmd, intern = TRUE)
357} 356}
358 357
359depends.pkg.vers <- function(dependency, index=1) { 358depends.pkg.vers <- function(dependency, index=1) {
360 result <- sub('^(.*)-([^-]*)$', '\\2', depends.pkg.fullname(dependency, index)) 359 result <- sub('^(.*)-([^-]*)$', '\\2', depends.pkg.fullname(dependency, index))
361 result 360 result
362} 361}
363 362
364depends.vers <- function(dependency, index=1) { 363depends.vers <- function(dependency, index=1) {
365 if (length(dependency) == 2) 364 if (length(dependency) == 2)
366 trim.space(dependency[2]) 365 trim.space(dependency[2])
367 else 366 else
368 trim.space(paste0('>=', depends.pkg.vers(dependency, index))) 367 trim.space(paste0('>=', depends.pkg.vers(dependency, index)))