ledger: Backport commit (see #3187)

This commit is contained in:
Fredrik Fornwall 2019-01-29 11:19:35 +01:00
parent 482a844092
commit 8b5fe7154a
2 changed files with 25 additions and 1 deletions

View File

@ -2,7 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://www.ledger-cli.org
TERMUX_PKG_DESCRIPTION="Powerful, double-entry accounting system" TERMUX_PKG_DESCRIPTION="Powerful, double-entry accounting system"
TERMUX_PKG_LICENSE="BSD 3-Clause" TERMUX_PKG_LICENSE="BSD 3-Clause"
TERMUX_PKG_VERSION=3.1.1 TERMUX_PKG_VERSION=3.1.1
TERMUX_PKG_REVISION=7 TERMUX_PKG_REVISION=8
TERMUX_PKG_SRCURL=https://github.com/ledger/ledger/archive/v${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SRCURL=https://github.com/ledger/ledger/archive/v${TERMUX_PKG_VERSION}.tar.gz
TERMUX_PKG_SHA256=90f06561ab692b192d46d67bc106158da9c6c6813cc3848b503243a9dfd8548a TERMUX_PKG_SHA256=90f06561ab692b192d46d67bc106158da9c6c6813cc3848b503243a9dfd8548a
TERMUX_PKG_DEPENDS="boost, libedit, libmpfr, utf8cpp, libgmp" TERMUX_PKG_DEPENDS="boost, libedit, libmpfr, utf8cpp, libgmp"

View File

@ -0,0 +1,24 @@
From dab0039680cde39bd50404d1466f3ad50e012b68 Mon Sep 17 00:00:00 2001
From: Ivy Foster <iff@escondida.tk>
Date: Thu, 26 Oct 2017 17:10:48 -0500
Subject: [PATCH] src/global.cc: do not parse user-specified init-file twice
---
src/global.cc | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/src/global.cc b/src/global.cc
index b1c45d45f..37765a9b3 100644
--- a/src/global.cc
+++ b/src/global.cc
@@ -136,9 +136,7 @@ void global_scope_t::read_init()
path init_file;
if (HANDLED(init_file_)) {
init_file=HANDLER(init_file_).str();
- if (exists(init_file)) {
- parse_init(init_file);
- } else {
+ if (!exists(init_file)) {
throw_(parse_error, _f("Could not find specified init file %1%") % init_file);
}
} else {