From 18d4b947255f910cd93b9aec4963d03231b15913 Mon Sep 17 00:00:00 2001 From: Collin Funk Date: Mon, 25 Mar 2024 21:33:29 -0700 Subject: [PATCH] gnulib-tool.py: Fix sorting of modules when --local-dir is used. * pygnulib/GLModuleSystem.py (GLModule.__eq__, GLModule.__ne__) (GLModule.__ge__, GLModule.__gt__, GLModule.__hash__, GLModule.__le__) (GLModule.__lt__): Use module names as identifiers instead of paths. --- ChangeLog | 7 +++++++ pygnulib/GLModuleSystem.py | 14 +++++++------- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index d72b1ebb82..2ae1c7340e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2024-03-25 Collin Funk + + gnulib-tool.py: Fix sorting of modules when --local-dir is used. + * pygnulib/GLModuleSystem.py (GLModule.__eq__, GLModule.__ne__) + (GLModule.__ge__, GLModule.__gt__, GLModule.__hash__, GLModule.__le__) + (GLModule.__lt__): Use module names as identifiers instead of paths. + 2024-03-25 Collin Funk gnulib-tool.py: Only process configure.ac once. diff --git a/pygnulib/GLModuleSystem.py b/pygnulib/GLModuleSystem.py index d2c83b2911..38379da3d3 100644 --- a/pygnulib/GLModuleSystem.py +++ b/pygnulib/GLModuleSystem.py @@ -231,7 +231,7 @@ class GLModule(object): '''x.__eq__(y) <==> x==y''' result = False if type(module) is GLModule: - if self.path == module.path: + if self.getName() == module.getName(): result = True return result @@ -239,7 +239,7 @@ class GLModule(object): '''x.__ne__(y) <==> x!=y''' result = False if type(module) is GLModule: - if self.path != module.path: + if self.getName() != module.getName(): result = True return result @@ -247,7 +247,7 @@ class GLModule(object): '''x.__ge__(y) <==> x>=y''' result = False if type(module) is GLModule: - if self.path >= module.path: + if self.getName() >= module.getName(): result = True return result @@ -255,20 +255,20 @@ class GLModule(object): '''x.__gt__(y) <==> x>y''' result = False if type(module) is GLModule: - if self.path > module.path: + if self.getName() > module.getName(): result = True return result def __hash__(self): '''x.__hash__() <==> hash(x)''' - result = hash(self.path) ^ hash(self.patched) + result = hash(self.getName()) ^ hash(self.patched) return result def __le__(self, module): '''x.__le__(y) <==> x<=y''' result = False if type(module) is GLModule: - if self.path <= module.path: + if self.getName() <= module.getName(): result = True return result @@ -276,7 +276,7 @@ class GLModule(object): '''x.__lt__(y) <==> x