texinfo-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

branch master updated: * tp/texi2any.pl (add_config_paths): remove a spu


From: Patrice Dumas
Subject: branch master updated: * tp/texi2any.pl (add_config_paths): remove a spurious subdir in @xdg_result_dirs. Also distinguish deprecated_dir and deprecated_result_dir to check if deprecated_dir is in used_xdg_base_dirs and put it in used_base_dirs.
Date: Sun, 15 Dec 2024 15:34:43 -0500

This is an automated email from the git hooks/post-receive script.

pertusus pushed a commit to branch master
in repository texinfo.

The following commit(s) were added to refs/heads/master by this push:
     new a937b70a5b * tp/texi2any.pl (add_config_paths): remove a spurious 
subdir in @xdg_result_dirs.  Also distinguish deprecated_dir and 
deprecated_result_dir to check if deprecated_dir is in used_xdg_base_dirs and 
put it in used_base_dirs.
a937b70a5b is described below

commit a937b70a5be97c8f153543e61214cb68b0f78385
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sun Dec 15 21:34:35 2024 +0100

    * tp/texi2any.pl (add_config_paths): remove a spurious subdir in
    @xdg_result_dirs.  Also distinguish deprecated_dir and
    deprecated_result_dir to check if deprecated_dir is in
    used_xdg_base_dirs and put it in used_base_dirs.
---
 ChangeLog      |  7 +++++++
 tp/texi2any.pl | 11 +++++------
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ab40acaab9..0cf8d650fc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2024-12-15  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/texi2any.pl (add_config_paths): remove a spurious subdir in
+       @xdg_result_dirs.  Also distinguish deprecated_dir and
+       deprecated_result_dir to check if deprecated_dir is in
+       used_xdg_base_dirs and put it in used_base_dirs.
+
 2024-12-15  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Texinfo/Common.pm (locate_include_file): remove comments, move
diff --git a/tp/texi2any.pl b/tp/texi2any.pl
index 85d69d1081..0aaf14446d 100755
--- a/tp/texi2any.pl
+++ b/tp/texi2any.pl
@@ -417,7 +417,7 @@ sub add_config_paths($$$$;$$) {
   if (defined($ENV{$env_string}) and $ENV{$env_string} ne '') {
     foreach my $dir (split(':', $ENV{$env_string})) {
       if ($dir ne '') {
-        push @xdg_result_dirs, "$dir/$subdir";
+        push @xdg_result_dirs, $dir;
         $used_xdg_base_dirs{$dir} = 1;
       }
     }
@@ -425,16 +425,15 @@ sub add_config_paths($$$$;$$) {
   my @result_dirs;
   my %used_base_dirs;
   if (defined($installation_dir)) {
-      #and not $used_base_dirs{$installation_dir}) {
     my $install_result_dir = "$installation_dir/$subdir";
     push @result_dirs, $install_result_dir;
     $used_base_dirs{$installation_dir} = 1;
     if ($overriding_dirs and $overriding_dirs->{$installation_dir}) {
-      my $deprecated_dir
-       = "$overriding_dirs->{$installation_dir}/$subdir";
+      my $deprecated_dir = $overriding_dirs->{$installation_dir};
+      my $deprecated_result_dir = "$deprecated_dir/$subdir";
       if (not $used_xdg_base_dirs{$deprecated_dir}) {
-        $deprecated_dirs->{$deprecated_dir} = $install_result_dir;
-        push @result_dirs, $deprecated_dir;
+        $deprecated_dirs->{$deprecated_result_dir} = $install_result_dir;
+        push @result_dirs, $deprecated_result_dir;
         $used_base_dirs{$deprecated_dir} = 1;
       }
     }



reply via email to

[Prev in Thread] Current Thread [Next in Thread]