Aaron M. Ucko pushed to branch master at Debian Med / ncbi-vdb
Commits: e22b33fa by Aaron M. Ucko at 2020-05-25T22:38:24-04:00 ncbi-vdb 2.10.6+dfsg-3: Optionally reinstate def. schema, see 961347 debian/patches/optionally_reinstate_default_schema.patch: New patch to let callers use the default schema, otherwise dropped upstream as of 2.10.0. (The toggle is a new global variable SRAUseLegacyDefaultSchema, which sra-sdk's tools/sra-load will enable to address the autopkgtest failure #961347.) - - - - - 3 changed files: - debian/changelog - + debian/patches/optionally_reinstate_default_schema.patch - debian/patches/series Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,13 @@ +ncbi-vdb (2.10.6+dfsg-3) unstable; urgency=medium + + * debian/patches/optionally_reinstate_default_schema.patch: New patch to + let callers use the default schema, otherwise dropped upstream as of + 2.10.0. (The toggle is a new global variable + SRAUseLegacyDefaultSchema, which sra-sdk's tools/sra-load will enable + to address the autopkgtest failure #961347.) + + -- Aaron M. Ucko <[email protected]> Mon, 25 May 2020 22:38:23 -0400 + ncbi-vdb (2.10.6+dfsg-2) unstable; urgency=medium * Install libs/vfs/services-priv.h as .../services-priv-internal.h to ===================================== debian/patches/optionally_reinstate_default_schema.patch ===================================== @@ -0,0 +1,32 @@ +--- a/libs/sra/sraschema.c ++++ b/libs/sra/sraschema.c +@@ -35,6 +35,7 @@ + #include "sraschema-priv.h" + #include "sra-priv.h" + ++LIB_EXPORT bool SRAUseLegacyDefaultSchema = false; + + /*-------------------------------------------------------------------------- + * SRASchema +@@ -60,8 +61,10 @@ LIB_EXPORT rc_t CC SRASchemaMake ( VSche + if ( rc == 0 ) + { + /* SRASchemaMake is deprecated: when it is called - return an empty schema ++ * by default */ ++ if (SRAUseLegacyDefaultSchema) + rc = VSchemaParseText ( * schema, "sra-schema", +- sra_schema_text, sra_schema_size ); */ ++ sra_schema_text, sra_schema_size ); + if ( rc == 0 ) + return 0; + +--- a/interfaces/sra/sraschema.h ++++ b/interfaces/sra/sraschema.h +@@ -63,6 +63,7 @@ struct VDBManager; + */ + SRA_EXTERN rc_t CC SRAMgrMakeSRASchema ( struct SRAMgr const *self, struct VSchema **schema ); + SRA_EXTERN rc_t CC VDBManagerMakeSRASchema ( struct VDBManager const *self, struct VSchema **schema ); ++SRA_EXTERN bool SRAUseLegacyDefaultSchema; + + + #ifdef __cplusplus ===================================== debian/patches/series ===================================== @@ -13,3 +13,4 @@ i386-uint64_msbit.patch # fix_linking.patch fix_path_mbedtls.patch redefine_CALL_MBEDTLS.patch +optionally_reinstate_default_schema.patch View it on GitLab: https://salsa.debian.org/med-team/ncbi-vdb/-/commit/e22b33fa9d170c6bb1851cb63e81e9535a68267b -- View it on GitLab: https://salsa.debian.org/med-team/ncbi-vdb/-/commit/e22b33fa9d170c6bb1851cb63e81e9535a68267b You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ debian-med-commit mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-med-commit
