Skip to content

Commit

Permalink
Revise qtlversion() to handle case like "1.50"
Browse files Browse the repository at this point in the history
  • Loading branch information
kbroman committed Aug 5, 2021
1 parent d43b2b9 commit b581057
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 5 deletions.
4 changes: 2 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package: qtl
Version: 1.49-1
Date: 2021-06-30
Version: 1.49-2
Date: 2021-08-05
Title: Tools for Analyzing QTL Experiments
Author: Karl W Broman <[email protected]> and Hao Wu, with
ideas from Gary Churchill and Saunak Sen and contributions from
Expand Down
6 changes: 5 additions & 1 deletion NEWS.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,17 @@ copyright (c) 2001-2021, Karl W Broman
at https://www.r-project.org/Licenses/GPL-3
----------------------------------------------------------------------

## Verison 1.49, 2021-06-30
## Verison 1.49, 2021-08-05

## New features

- `cim()` now includes an `addcovar` argument for including additional
covariates in the model.

### Minor changes

- Revised qtlversion() to handle a case like "1.50".


## Version 1.48, 2021-03-24

Expand Down
8 changes: 6 additions & 2 deletions R/util.R
Original file line number Diff line number Diff line change
Expand Up @@ -3161,8 +3161,12 @@ qtlversion <-
{
version <- unlist(packageVersion("qtl"))

# make it like #.#-#
paste(c(version,".","-")[c(1,4,2,5,3)], collapse="")
if(length(version) == 3) {
# make it like #.#-#
return( paste(c(version, ".", "-")[c(1,4,2,5,3)], collapse="") )
}

paste(version, collapse=".")
}


Expand Down

0 comments on commit b581057

Please sign in to comment.