diff mbox series

python3: move sqlite files into python-sqlite

Message ID 20180926120246.1024-1-ross.burton@intel.com
State Superseded
Headers show
Series python3: move sqlite files into python-sqlite | expand

Commit Message

Ross Burton Sept. 26, 2018, 12:02 p.m. UTC
sqlite3/__init__.py was accidentally included in python3-misc.

Signed-off-by: Ross Burton <ross.burton@intel.com>

---
 meta/recipes-devtools/python/python3/python3-manifest.json | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

-- 
2.11.0

-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Comments

Alejandro Enedino Hernandez Samaniego Sept. 26, 2018, 6:08 p.m. UTC | #1
Hey Ross,


On 9/26/2018 5:02 AM, Ross Burton wrote:
> sqlite3/__init__.py was accidentally included in python3-misc.

>

> Signed-off-by: Ross Burton <ross.burton@intel.com>

> ---

>   meta/recipes-devtools/python/python3/python3-manifest.json | 6 ++----

>   1 file changed, 2 insertions(+), 4 deletions(-)

>

> diff --git a/meta/recipes-devtools/python/python3/python3-manifest.json b/meta/recipes-devtools/python/python3/python3-manifest.json

> index 539b7967b59..fe8bb992928 100644

> --- a/meta/recipes-devtools/python/python3/python3-manifest.json

> +++ b/meta/recipes-devtools/python/python3/python3-manifest.json

> @@ -994,13 +994,11 @@

>           ],

>           "files": [

>               "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/_sqlite3.*.so",

> -            "${libdir}/python${PYTHON_MAJMIN}/sqlite3/dbapi2.py",

> -            "${libdir}/python${PYTHON_MAJMIN}/sqlite3/dump.py"

> +            "${libdir}/python${PYTHON_MAJMIN}/sqlite3/*.py"

>           ],



For python modules that use an __init__.py file, they need to include 
the directory instead of the wildcard *.py, that way when the manifest 
is created it passes the whole directory to the new manifest, and it 
does check for dependencies with the directory name, otherwise the 
wildcard is just ignored and cant check for rdepends.

Cheers,

Alejandro


>           "cached": [

>               "${libdir}/python${PYTHON_MAJMIN}/sqlite3/__pycache__",

> -            "${libdir}/python${PYTHON_MAJMIN}/sqlite3/__pycache__/dbapi2.*.pyc",

> -            "${libdir}/python${PYTHON_MAJMIN}/sqlite3/__pycache__/dump.*.pyc"

> +            "${libdir}/python${PYTHON_MAJMIN}/sqlite3/__pycache__/*.pyc"

>           ]

>       },

>       "stringold": {

-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
diff mbox series

Patch

diff --git a/meta/recipes-devtools/python/python3/python3-manifest.json b/meta/recipes-devtools/python/python3/python3-manifest.json
index 539b7967b59..fe8bb992928 100644
--- a/meta/recipes-devtools/python/python3/python3-manifest.json
+++ b/meta/recipes-devtools/python/python3/python3-manifest.json
@@ -994,13 +994,11 @@ 
         ],
         "files": [
             "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/_sqlite3.*.so",
-            "${libdir}/python${PYTHON_MAJMIN}/sqlite3/dbapi2.py",
-            "${libdir}/python${PYTHON_MAJMIN}/sqlite3/dump.py"
+            "${libdir}/python${PYTHON_MAJMIN}/sqlite3/*.py"
         ],
         "cached": [
             "${libdir}/python${PYTHON_MAJMIN}/sqlite3/__pycache__",
-            "${libdir}/python${PYTHON_MAJMIN}/sqlite3/__pycache__/dbapi2.*.pyc",
-            "${libdir}/python${PYTHON_MAJMIN}/sqlite3/__pycache__/dump.*.pyc"
+            "${libdir}/python${PYTHON_MAJMIN}/sqlite3/__pycache__/*.pyc"
         ]
     },
     "stringold": {