From 14fb1cfd8d7e4a2495ba79c282a57674dbcfe651 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Fri, 30 Sep 2022 16:20:21 +0200 Subject: [PATCH 1/2] backup: Try to fix again the infamous issue where from_yunohost_version gets filled with 'BASH_XTRACEFD' --- src/utils/packages.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/utils/packages.py b/src/utils/packages.py index 3105bc4c7..0e92787da 100644 --- a/src/utils/packages.py +++ b/src/utils/packages.py @@ -40,7 +40,7 @@ def get_ynh_package_version(package): # may handle changelog differently ! 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): return {"version": "?", "repo": "?"} out = check_output(cmd).split() From 70927d5e04419727cec794e0885f4359a093d8f0 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Fri, 30 Sep 2022 16:26:58 +0200 Subject: [PATCH 2/2] Update changelog for 11.0.9.15 --- debian/changelog | 12 ++++++++++++ maintenance/make_changelog.sh | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index f6fbe6eba..659d255b5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 Fri, 30 Sep 2022 16:24:59 +0200 + yunohost (11.0.9.14) stable; urgency=low - [fix] dns: confusion on XMPP CNAME records for nohost.me & co domains (f6057d25) diff --git a/maintenance/make_changelog.sh b/maintenance/make_changelog.sh index a73b5061b..f5d1572a6 100644 --- a/maintenance/make_changelog.sh +++ b/maintenance/make_changelog.sh @@ -1,7 +1,7 @@ VERSION="?" RELEASE="testing" 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) EMAIL=$(git config --global --get user.email)