Skip to contentSkip to conversation

lib/oe/package-manager: optimize install_complementary

PATCH In review Claus Stovgaard 2 participants 5 messages Sep 26, 2024

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 lib/oe/package-manager: optimize install_complementary

We are rewriting the globs variable, so it can't be None, but rather a string. E.g. the lines above.

if globs is None:
globs = self.d.getVar('IMAGE_INSTALL_COMPLEMENTARY')

As globs is now a string, we need to test for empty string instead of compare with None.

---
 meta/lib/oe/package_manager/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/lib/oe/package_manager/__init__.py +1 -1
index d3b2317894..1d923c436e 100644
@@ -365,7 +365,7 @@ class PackageManager(object, metaclass=ABCMeta):
                 for complementary_linguas in (self.d.getVar('IMAGE_LINGUAS_COMPLEMENTARY') or "").split():
                     globs += (" " + complementary_linguas) % lang
 
-        if globs is None:
+        if not globs:
             return
 
         # we need to write the list of installed packages to a file because the
Signature · 1 line
2.45.2
#1 lore raw

'optimize install_complementary' really doesn't match what the commit contains, please be more specific.

Alex

Quoted 40 lines · Claus Stovgaard via lists.openembedded.org

We are rewriting the globs variable, so it can't be None, but rather a string. E.g. the lines above.

if globs is None:
globs = self.d.getVar('IMAGE_INSTALL_COMPLEMENTARY')

As globs is now a string, we need to test for empty string instead of compare with None.

---
 meta/lib/oe/package_manager/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/lib/oe/package_manager/__init__.py +1 -2
index d3b2317894..1d923c436e 100644
@@ -365,7 +365,7 @@ class PackageManager(object, metaclass=ABCMeta):
                 for complementary_linguas in (self.d.getVar('IMAGE_LINGUAS_COMPLEMENTARY') or "").split():
                     globs += (" " + complementary_linguas) % lang
 
-        if globs is None:
+        if not globs:
             return
 
         # we need to write the list of installed packages to a file because the
--

2.45.2

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#204970): https://lists.openembedded.org/g/openembedded-core/message/204970
Mute This Topic: https://lists.openembedded.org/mt/108664320/1686489
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

#2 lore raw

Hi Alex

Would a better headline be "don't handle empty glob"

Also a small question.

Looking at the getVar code - It seems that it can return None in some specific situations.

So it might be more clear to do

if globs is None or globs == "":
return

The optimizing part is that the install_complementary normally does.

if globs is None:

    globs = ""

if globs is None:
return

do work, where if glob is empty string, it does not matter. (Involve creating installed_pkgs file, and process it with oe-pkgdata- util but with empty glob, so it will never return anything, just spend time on each line in the file, and create a empty list of packages, where it will call install of those)

So the change optimize by removing the work on an empty string.

What is your take.

Do you like "don't handle empty glob" as headline, and what do you prefer

if globs is None or globs == "":
return

vs

if not globs:
return

/Claus

Quoted 58 lines · Alexander Kanavin

'optimize install_complementary' really doesn't match what the commit contains, please be more specific.

Alex

Quoted 50 lines · Claus Stovgaard via lists.openembedded.org

We are rewriting the globs variable, so it can't be None, but rather a
string. E.g. the lines above.

if globs is None:
    globs = self.d.getVar('IMAGE_INSTALL_COMPLEMENTARY')

As globs is now a string, we need to test for empty string instead of
compare with None.

---
 meta/lib/oe/package_manager/__init__.py | 2 +-

 1 file changed, 1 insertion(+), 1 deletion(-)
meta/lib/oe/package_manager/__init__.py +0 -0
index d3b2317894..1d923c436e 100644
@@ -365,7 +365,7 @@ class PackageManager(object,

metaclass=ABCMeta):
                 for complementary_linguas in (self.d.getVar('IMAGE_LINGUAS_COMPLEMENTARY') or "").split():
                     globs += (" " + complementary_linguas) % lang

-        if globs is None:
+        if not globs:
             return

         # we need to write the list of installed packages to a
file because the
--
2.45.2

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group. View/Reply Online (#204970):
https://lists.openembedded.org/g/openembedded-core/message/204970
Mute This Topic:
https://lists.openembedded.org/mt/108664320/1686489
Group Owner: [email protected] Unsubscribe:
https://lists.openembedded.org/g/openembedded-core/unsub [
[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

#3 lore raw

Hello,

the headline should be 'return early from install_complementary if glob is either None or an empty string'.

I prefer a shorter condition.

Alex

Quoted 112 lines · On Thu, 26 Sept 2024 at 17:01, <[email protected]> wrote:

Hi Alex

Would a better headline be "don't handle empty glob"

Also a small question.

Looking at the getVar code - It seems that it can return None in some specific situations.

So it might be more clear to do

if globs is None or globs == "":
return

The optimizing part is that the install_complementary normally does.

if globs is None:

    globs = ""

if globs is None:
return

do work, where if glob is empty string, it does not matter. (Involve creating installed_pkgs file, and process it with oe-pkgdata- util but with empty glob, so it will never return anything, just spend time on each line in the file, and create a empty list of packages, where it will call install of those)

So the change optimize by removing the work on an empty string.

What is your take.

Do you like "don't handle empty glob" as headline, and what do you prefer

if globs is None or globs == "":
return

vs

if not globs:
return

/Claus

Quoted 58 lines · Alexander Kanavin

'optimize install_complementary' really doesn't match what the commit contains, please be more specific.

Alex

Quoted 50 lines · Claus Stovgaard via lists.openembedded.org

We are rewriting the globs variable, so it can't be None, but rather a
string. E.g. the lines above.

if globs is None:
globs = self.d.getVar('IMAGE_INSTALL_COMPLEMENTARY')

As globs is now a string, we need to test for empty string instead of
compare with None.

---
 meta/lib/oe/package_manager/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/lib/oe/package_manager/__init__.py +0 -0
index d3b2317894..1d923c436e 100644
@@ -365,7 +365,7 @@ class PackageManager(object,

metaclass=ABCMeta):
for complementary_linguas in
(self.d.getVar('IMAGE_LINGUAS_COMPLEMENTARY') or "").split():

                     globs += (" " + complementary_linguas) % lang
meta/lib/oe/package_manager/__init__.py +1 -1
-        if globs is None:
+        if not globs:
             return
 
         # we need to write the list of installed packages to a

file because the
--
2.45.2

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group. View/Reply Online (#204970):
https://lists.openembedded.org/g/openembedded-core/message/204970
Mute This Topic:
https://lists.openembedded.org/mt/108664320/1686489
Group Owner: [email protected] Unsubscribe:
https://lists.openembedded.org/g/openembedded-core/unsub [ [email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

#4 lore raw

Hi

Se version 2 of the patch.

/Claus

Quoted 129 lines · Alexander Kanavin

Hello,

the headline should be 'return early from install_complementary if glob is either None or an empty string'.

I prefer a shorter condition.

Alex

Quoted 119 lines · On Thu, 26 Sept 2024 at 17:01, <[email protected]> wrote:

Hi Alex

Would a better headline be "don't handle empty glob"

Also a small question.

Looking at the getVar code - It seems that it can return None in some
specific situations.

So it might be more clear to do

if globs is None or globs == "":
    return

The optimizing part is that the install_complementary normally does.

if globs is None:
    globs = ""

if globs is None:
    return

do work, where if glob is empty string, it does not matter. (Involve creating installed_pkgs file, and process it with oe- pkgdata-
util but with empty glob, so it will never return anything, just spend
time on each line in the file, and create a empty list of packages, where it will call install of those)

So the change optimize by removing the work on an empty string.

What is your take.

Do you like "don't handle empty glob" as headline, and what do you prefer

if globs is None or globs == "":
    return

vs

if not globs:
    return

/Claus

Quoted 61 lines · Alexander Kanavin

'optimize install_complementary' really doesn't match what the commit
contains, please be more specific.

Alex

Quoted 52 lines · Claus Stovgaard via lists.openembedded.org

We are rewriting the globs variable, so it can't be None, but rather a
string. E.g. the lines above.

if globs is None:
    globs = self.d.getVar('IMAGE_INSTALL_COMPLEMENTARY')

As globs is now a string, we need to test for empty string instead
of
compare with None.

---
 meta/lib/oe/package_manager/__init__.py | 2 +-

 1 file changed, 1 insertion(+), 1 deletion(-)
meta/lib/oe/package_manager/__init__.py +0 -0
index d3b2317894..1d923c436e 100644
@@ -365,7 +365,7 @@ class PackageManager(object,

metaclass=ABCMeta):
                 for complementary_linguas in (self.d.getVar('IMAGE_LINGUAS_COMPLEMENTARY') or "").split():
                     globs += (" " + complementary_linguas) % lang

-        if globs is None:
+        if not globs:
             return

         # we need to write the list of installed packages to a
file because the
--
2.45.2

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group. View/Reply Online (#204970):
https://lists.openembedded.org/g/openembedded-core/message/204970
Mute This Topic:
https://lists.openembedded.org/mt/108664320/1686489
Group Owner: [email protected] Unsubscribe:
https://lists.openembedded.org/g/openembedded-core/unsub [
[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-