cpsw_yaml_merge_main.cc: fixed -Y option

Only set filename from non-option args if not already set.
slaclab · Jun 28, 2019 · afcf2d8 · afcf2d8
1 parent a91d3f0
commit afcf2d8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/RELEASE_NOTES b/RELEASE_NOTES
@@ -1,3 +1,5 @@
+    yaml_cpsw_merge (program): fixed -Y option
+
 R4.1.0:
     Use python 3.6.1 by default.
 

diff --git a/src/cpsw_yaml_merge_main.cc b/src/cpsw_yaml_merge_main.cc
@@ -61,7 +61,9 @@ const char *fn = 0;
 		usage( argv[0] );
 		return 1;
 	} else {
-		fn = argv[optind];
+		if ( ! fn ) {
+			fn = argv[optind];
+		}
 	}
 
 	YAML::Node root = YAML::LoadFile( fn );