Merge ~mitchellaugustin/ubuntu/+source/texinfo:update-info-dir-fix into ubuntu/+source/texinfo:ubuntu/devel

Proposed by Mitchell Augustin
Status: Needs review
Proposed branch: ~mitchellaugustin/ubuntu/+source/texinfo:update-info-dir-fix
Merge into: ubuntu/+source/texinfo:ubuntu/devel
Diff against target: 47 lines (+15/-2)
3 files modified
debian/changelog (+7/-0)
debian/control (+2/-1)
debian/update-info-dir (+6/-1)
Reviewer Review Type Date Requested Status
Ubuntu Sponsors Pending
Review via email: mp+499468@code.launchpad.net

Commit message

Read and export variables instead of sourcing /etc/environment (LP: #2125808)

Description of the change

Read and export variables instead of sourcing /etc/environment (LP: #2125808)

To post a comment you must log in.
1c2f2ee... by Mitchell Augustin

Changelog update

efe0ca7... by Mitchell Augustin

update-maintainer

Unmerged commits

efe0ca7... by Mitchell Augustin

update-maintainer

1c2f2ee... by Mitchell Augustin

Changelog update

9a09827... by Mitchell Augustin

Read and export variables instead of sourcing /etc/environment (LP: #2125808)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/changelog b/debian/changelog
2index 1ce5a82..30e51f6 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,10 @@
6+texinfo (7.2-5ubuntu1) resolute; urgency=medium
7+
8+ * Read and export variables instead of sourcing /etc/environment (LP:
9+ #2125808)
10+
11+ -- Mitchell Augustin <mitchell.augustin@canonical.com> Wed, 28 Jan 2026 15:57:03 -0600
12+
13 texinfo (7.2-5) unstable; urgency=medium
14
15 [ Niko Tyni ]
16diff --git a/debian/control b/debian/control
17index 54f0d3b..c321080 100644
18--- a/debian/control
19+++ b/debian/control
20@@ -1,7 +1,8 @@
21 Source: texinfo
22 Section: doc
23 Priority: standard
24-Maintainer: Debian TeX Task Force <debian-tex-maint@lists.debian.org>
25+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
26+XSBC-Original-Maintainer: Debian TeX Task Force <debian-tex-maint@lists.debian.org>
27 Uploaders: Norbert Preining <norbert@preining.info>,
28 Frank Küster <frank@debian.org>,
29 Hilmar Preuße <hille42@debian.org>
30diff --git a/debian/update-info-dir b/debian/update-info-dir
31index 2856647..a20fbe0 100755
32--- a/debian/update-info-dir
33+++ b/debian/update-info-dir
34@@ -16,7 +16,12 @@ set -e
35 unset LANGUAGE
36 unset LANG
37 if [ -r /etc/environment ] ; then
38- . /etc/environment
39+ exec 9<&0 </etc/environment
40+ while read -r env
41+ do if [ -n "$env" ]
42+ then export "$env"
43+ fi; done
44+ exec 0<&9 9<&-
45 fi
46 if [ -r /etc/default/locale ] ; then
47 . /etc/default/locale

Subscribers

People subscribed via source and target branches