YunoHost/yunohost
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost.git synced 2024-09-03 20:06:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/dev' into 11.1

Browse source
This commit is contained in:
Alexandre Aubin 2022-10-05 14:25:01 +02:00
commit 031e7c482e
3 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
debian/changelog vendored
View file

@ -1,3 +1,15 @@
yunohost (11.0.9.15) stable; urgency=low
- [fix] Lidswitch if no reboot ([#1506](https://github.com/yunohost/yunohost/pull/1506))
- [fix] postinstall: edge case where var would get undefined.. (b7bea608)
- [fix] backup: Try to fix again the infamous issue where from_yunohost_version gets filled with 'BASH_XTRACEFD' (14fb1cfd)
- [fix] Various english wording improvements ([#1507](https://github.com/yunohost/yunohost/pull/1507))
- [i18n] Translations updated for Arabic, Slovak, Telugu, Turkish
Thanks to all contributors <3 ! (Alice Kile, ButterflyOfFire, Jose Riha, ljf (zamentur), marty hiatt, Sedat Albayrak)
-- Alexandre Aubin <alex.aubin@mailoo.org> Fri, 30 Sep 2022 16:24:59 +0200
yunohost (11.0.9.14) stable; urgency=low yunohost (11.0.9.14) stable; urgency=low
- [fix] dns: confusion on XMPP CNAME records for nohost.me & co domains (f6057d25) - [fix] dns: confusion on XMPP CNAME records for nohost.me & co domains (f6057d25)

2
maintenance/make_changelog.sh
View file

@ -1,7 +1,7 @@
VERSION="?" VERSION="?"
RELEASE="testing" RELEASE="testing"
REPO=$(basename $(git rev-parse --show-toplevel)) REPO=$(basename $(git rev-parse --show-toplevel))
REPO_URL=$(git remote get-url origin) REPO_URL="https://github.com/yunohost/yunohost"
ME=$(git config --global --get user.name) ME=$(git config --global --get user.name)
EMAIL=$(git config --global --get user.email) EMAIL=$(git config --global --get user.email)

2
src/utils/system.py
View file

@ -112,7 +112,7 @@ def get_ynh_package_version(package):
# may handle changelog differently ! # may handle changelog differently !
changelog = "/usr/share/doc/%s/changelog.gz" % package changelog = "/usr/share/doc/%s/changelog.gz" % package
cmd = "gzip -cd %s 2>/dev/null | head -n1" % changelog cmd = "gzip -cd %s 2>/dev/null | grep -v 'BASH_XTRACEFD' | head -n1" % changelog
if not os.path.exists(changelog): if not os.path.exists(changelog):
return {"version": "?", "repo": "?"} return {"version": "?", "repo": "?"}
out = check_output(cmd).split() out = check_output(cmd).split()