nihilist/monero
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Warn user on attempting to remove build directory for make clean

Browse Source
This commit is contained in:
mydesktop 2014-04-30 13:01:32 -04:00
parent e940386f9a
commit 8e92162d2c
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@ -25,6 +25,9 @@ test-release: build-release
all-release: build-release all-release: build-release
clean: clean:
@echo "WARNING: Back-up your wallet if it exists within ./build!" ; \
read -r -p "This will destroy the build directory, continue (y/N)?: " CONTINUE; \
[ $$CONTINUE = "y" ] || [ $$CONTINUE = "Y" ] || (echo "Exiting."; exit 1;)
rm -rf build rm -rf build
tags: tags:

2
src/wallet/wallet2.cpp
View File

@ -38,7 +38,7 @@ void wallet2::process_new_transaction(const cryptonote::transaction& tx, uint64_
uint64_t tx_money_got_in_outs = 0; uint64_t tx_money_got_in_outs = 0;
crypto::public_key tx_pub_key = null_pkey; crypto::public_key tx_pub_key = null_pkey;
bool r = parse_and_validate_tx_extra(tx, tx_pub_key); bool r = parse_and_validate_tx_extra(tx, tx_pub_key);
THROW_WALLET_EXCEPTION_IF(!r, error::tx_extra_parse_error, tx); // THROW_WALLET_EXCEPTION_IF(!r, error::tx_extra_parse_error, tx);
r = lookup_acc_outs(m_account.get_keys(), tx, tx_pub_key, outs, tx_money_got_in_outs); r = lookup_acc_outs(m_account.get_keys(), tx, tx_pub_key, outs, tx_money_got_in_outs);
THROW_WALLET_EXCEPTION_IF(!r, error::acc_outs_lookup_error, tx, tx_pub_key, m_account.get_keys()); THROW_WALLET_EXCEPTION_IF(!r, error::acc_outs_lookup_error, tx, tx_pub_key, m_account.get_keys());