Re: [Tails-dev] Please review and merge bugfix/tordate_vs_br…

Delete this message

Reply to this message
Author: intrigeri
Date:  
To: The Tails public development discussion list
Subject: Re: [Tails-dev] Please review and merge bugfix/tordate_vs_bridge_mode
Hi,

anonym wrote (30 Nov 2012 12:13:09 GMT) :
>> Once we have a branch that looks mergeable, before merging, I'd like
>> someone to do the dozen of time sync' tests I had done for the last
>> time sync bugfix branch (and that discovered the bug we're fixing).


> I did this (in the branch's current (rebased) state).


Excellent.

>>> +if [ -e "${TOR_LOG}" ]; then
>>> + rm -f "${TOR_LOG}"
>>> +fi
>>
>> Why testing existence before rm -f?


> If we had `set -e` that would otherwise kill the script. Or one could've
> used "|| :" or "|| true" to handle all errors.


Ah, so I'm happy to share this bit of shell scripting knowledge:

  $ /bin/rm -f /nonexistent ; echo $?                        
  0


(Using "rm -f" is quite idiomatic, including in scripts run with
"set -e" such as Debian maintainer scripts, when one wants to delete
a file if it exists, and shut up else.)

> Thanks a lot! Here's a list of the modified/new commits which may make
> it easier to re-review this since a rebase occurred:

[...]
> The branch has been merged into experimental.


Nice job! Merged into devel, tagged pending.

Cheers,
--
intrigeri
| GnuPG key @ https://gaffer.ptitcanardnoir.org/intrigeri/intrigeri.asc
| OTR fingerprint @ https://gaffer.ptitcanardnoir.org/intrigeri/otr.asc