[med-svn] [Git][med-team/sra-sdk][master] 2 commits: allow_multi_help.patch (new): Tolerate extra --help in driver-tool.

[Aaron M. Ucko (@ucko)]

Aaron M. Ucko pushed to branch master at Debian Med / sra-sdk


Commits:
c99f53c5 by Aaron M. Ucko at 2021-10-18T21:31:06-04:00
allow_multi_help.patch (new): Tolerate extra --help in driver-tool.

- - - - -
a779f60e by Aaron M. Ucko at 2021-10-18T21:34:58-04:00
run_unversioned_tools.patch (new): Run tools by unversioned names

... per Debian's simplified installation arrangement.

- - - - -


4 changed files:

- debian/changelog
- + debian/patches/allow_multi_help.patch
- + debian/patches/run_unversioned_tools.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -12,8 +12,12 @@ sra-sdk (2.11.2+dfsg-1) UNRELEASED; urgency=medium
     absent ngs library.
   * debian/rules: Stop renaming kget (to avoid a file conflict, #851219)
     now that it's retired altogether.
+  * d/p/allow_multi_help.patch (new): Tolerate redundant --help
+    declarations within tools/driver-tool.
+  * d/p/run_unversioned_tools.patch (new): Look for tools by their
+    unversioned names, per Debian's simplified installation arrangement.
 
- -- Andreas Tille <tille at debian.org>  Fri, 15 Oct 2021 07:01:52 +0200
+ -- Aaron M. Ucko <ucko at debian.org>  Mon, 18 Oct 2021 21:34:57 -0400
 
 sra-sdk (2.10.9+dfsg-2) unstable; urgency=medium
 


=====================================
debian/patches/allow_multi_help.patch
=====================================
@@ -0,0 +1,34 @@
+Author: Aaron M. Ucko <ucko at debian.org>
+Last-Update: Mon, 18 Oct 2021 19:00:59 -0400
+Description: Tolerate redundant --help declarations within tools/driver-tool.
+
+--- a/tools/driver-tool/cmdline.cpp
++++ b/tools/driver-tool/cmdline.cpp
+@@ -1622,7 +1622,7 @@ namespace ncbi
+             std :: pair < String, Option * > long_pair ( opt -> long_name, opt );
+             std :: pair < std :: map < String, Option * > :: iterator, bool > long_found
+                 = mode -> long_opt_map . insert ( long_pair );
+-            if ( ! long_found . second )
++            if ( ! long_found . second  &&  opt -> long_name != "help" )
+             {
+                 NULTerminatedString zlong_name ( opt -> long_name );
+                 throw LogicException (
+@@ -1640,7 +1640,7 @@ namespace ncbi
+             std :: pair < String, Option * > short_pair ( opt -> short_name, opt );
+             std :: pair < std :: map < String, Option * > :: iterator, bool > short_found
+                 = mode -> short_opt_map . insert ( short_pair );
+-            if ( ! short_found . second )
++            if ( ! short_found . second   &&  opt -> long_name != "help" )
+             {
+                 NULTerminatedString zshort_name ( opt -> short_name );
+                 throw LogicException (
+@@ -1678,7 +1678,8 @@ namespace ncbi
+                 }
+                 else
+                 {
+-                    if ( memcmp ( pshort . data (), oshort . data (), oshort . size () ) == 0 )
++                    if ( memcmp ( pshort . data (), oshort . data (), oshort . size () ) == 0
++			 &&  opt -> long_name != "help" )
+                     {
+                         NULTerminatedString zoshort ( oshort );
+                         NULTerminatedString zpshort ( pshort );


=====================================
debian/patches/run_unversioned_tools.patch
=====================================
@@ -0,0 +1,16 @@
+Author: Aaron M. Ucko <ucko at debian.org>
+Last-Update: Mon, 18 Oct 2021 20:28:26 -0400
+Description: Look for tools by their unversioned names, per Debian's
+  simplified installation arrangement.
+
+--- a/tools/driver-tool/tool-path.hpp
++++ b/tools/driver-tool/tool-path.hpp
+@@ -72,7 +72,7 @@ public:
+         return path_ + ToolPath::seperator + basename_ + ".exe";
+ #else // POSIX
+         auto result = path_ + ToolPath::seperator + basename_;
+-        if (version_.size() > 0) result += '.' + version_;
++        // if (version_.size() > 0) result += '.' + version_;
+         return result;
+ #endif
+     }


=====================================
debian/patches/series
=====================================
@@ -22,3 +22,5 @@ use_exposed_headers.patch
 skip_broken_loaders.patch
 fix_libngs_linkage.patch
 skip_test_using_lots_of_memory.patch
+allow_multi_help.patch
+run_unversioned_tools.patch



View it on GitLab: https://salsa.debian.org/med-team/sra-sdk/-/compare/8dac48d0b489b1f950ae805adc69f42f3642471a...a779f60e5e3aab5e1c15af9fe7b7231c4adadc28

-- 
View it on GitLab: https://salsa.debian.org/med-team/sra-sdk/-/compare/8dac48d0b489b1f950ae805adc69f42f3642471a...a779f60e5e3aab5e1c15af9fe7b7231c4adadc28
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20211019/64fe0b02/attachment-0001.htm>