psi-jack
/
dotbot
mirror of
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge 8a4e8392fb into 53c26ba9e6

This commit is contained in:
Brian 2015-05-07 12:13:15 +00:00
parent 53c26ba9e6 8a4e8392fb
commit f0b205b400
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dotbot/cli.py
View File

@ -1,3 +1,5 @@
import os
import socket
from argparse import ArgumentParser
from .config import ConfigReader, ReadingError
from .dispatcher import Dispatcher, DispatchError
@ -24,6 +26,8 @@ def read_config(config_file):
def main():
log = Messenger()
os.environ.setdefault("HOSTNAME", socket.gethostname())
try:
parser = ArgumentParser()
add_options(parser)

2
dotbot/executor/linker.py
View File

@ -107,7 +107,7 @@ class Linker(Executor):
Returns true if successfully linked files.
'''
success = False
source = os.path.join(self._base_directory, source)
source = os.path.expandvars(os.path.join(self._base_directory, source))
if (not self._exists(link_name) and self._is_link(link_name) and
self._link_destination(link_name) != source):
self._log.warning('Invalid link %s -> %s' %