unbreak --import-dosage + --map

chrchang · Dec 7, 2024 · a1b7445 · a1b7445
1 parent e1744e0
commit a1b7445
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/2.0/plink2.cc b/2.0/plink2.cc
@@ -44,7 +44,7 @@
 namespace plink2 {
 #endif
 
-static const char ver_str[] = "PLINK v2.0.0-a.5.20"
+static const char ver_str[] = "PLINK v2.0.0-a.5.21"
 #ifdef NOLAPACK
   "NL"
 #elif defined(LAPACK_ILP64)
@@ -72,7 +72,7 @@ static const char ver_str[] = "PLINK v2.0.0-a.5.20"
 #elif defined(USE_AOCL)
   " AMD"
 #endif
-  " (3 Dec 2024)";
+  " (6 Dec 2024)";
 static const char ver_str2[] =
   // include leading space if day < 10, so character length stays the same
   " "
@@ -11367,8 +11367,8 @@ int main(int argc, char** argv) {
       logerrputs("Error: No input dataset.\n");
       goto main_ret_INVALID_CMDLINE_A;
     }
-    if (unlikely((xload & kfXloadMap) && (!(xload & kfXloadPed)))) {
-      logerrputs("Error: --map must be used with --ped.\n");
+    if (unlikely((xload & kfXloadMap) && (!(xload & (kfXloadPed | kfXloadPlink1Dosage))))) {
+      logerrputs("Error: --map must be used with --import-dosage or --ped.\n");
       goto main_ret_INVALID_CMDLINE_A;
     }
     if (unlikely((xload & kfXloadOxGen) && (!(xload & kfXloadOxSample)))) {

diff --git a/2.0/plink2_help.cc b/2.0/plink2_help.cc
@@ -205,7 +205,7 @@ PglErr DispHelp(const char* const* argvk, uint32_t param_ct) {
 "  --tped <filename>  : Specify full name of .tped file.\n"
 "  --tfam <filename>  : Specify full name of .tfam file.\n\n"
               );
-    HelpPrint("import-dosage\0dosage\0", &help_ctrl, 1,
+    HelpPrint("import-dosage\0dosage\0map\0", &help_ctrl, 1,
 "  --import-dosage <allele dosage file> ['noheader'] ['id-delim='<char>]\n"
 "                  ['skip0='<i>] ['skip1='<j>] ['skip2='<k>] ['dose1']\n"
 "                  ['format='<m>] [{ref-first | ref-last}]\n"