From: Heng Li Date: Fri, 31 Jul 2009 22:32:09 +0000 (+0000) Subject: * samtools-0.1.5-19 (r426) X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=044077138867278fd22419cf5dd313c82161f30f;p=samtools.git * samtools-0.1.5-19 (r426) * fixed a bug caused by recent modifications. Sorry. --- diff --git a/bamtk.c b/bamtk.c index f827aec..b39796f 100644 --- a/bamtk.c +++ b/bamtk.c @@ -4,7 +4,7 @@ #include "bam.h" #ifndef PACKAGE_VERSION -#define PACKAGE_VERSION "0.1.5-18 (r423)" +#define PACKAGE_VERSION "0.1.5-19 (r426)" #endif int bam_taf2baf(int argc, char *argv[]); diff --git a/sam_view.c b/sam_view.c index c2056ba..2e89921 100644 --- a/sam_view.c +++ b/sam_view.c @@ -77,9 +77,7 @@ int main_samview(int argc, char *argv[]) if (argc == optind) return usage(is_long_help); // generate the fn_list if necessary - if (fn_list && fn_ref) { - fprintf(stderr, "[main_samview] both -t and -T are applied. -T is ignored.\n"); - } else fn_list = samfaipath(fn_ref); + if (fn_list == 0 && fn_ref) fn_list = samfaipath(fn_ref); // open file handlers if ((in = samopen(argv[optind], in_mode, fn_list)) == 0) { fprintf(stderr, "[main_samview] fail to open file for reading.\n");