diff options
| -rw-r--r-- | README.rst | 2 | ||||
| -rw-r--r-- | dotfiles/cli.py | 2 | ||||
| -rw-r--r-- | dotfiles/core.py | 4 | ||||
| -rwxr-xr-x | test_dotfiles.py | 2 |
4 files changed, 5 insertions, 5 deletions
@@ -30,7 +30,7 @@ Interface Remove dotfile(s) from the repository. ``-s, --sync`` - Update dotfile symlinks. You can overwrite unmanaged files with ``-f`` or + Update dotfile symlinks. You can overwrite colliding files with ``-f`` or ``--force``. ``-m, --move`` diff --git a/dotfiles/cli.py b/dotfiles/cli.py index 1de9f1c..c14c0e8 100644 --- a/dotfiles/cli.py +++ b/dotfiles/cli.py @@ -59,7 +59,7 @@ def add_global_flags(parser): parser.add_option("-f", "--force", action="store_true", dest="force", default=False, - help="ignore unmanaged dotfiles (use with --sync)") + help="overwrite colliding dotfiles (use with --sync)") parser.add_option("-R", "--repo", type="string", dest="repository", diff --git a/dotfiles/core.py b/dotfiles/core.py index 76a354d..daf06f1 100644 --- a/dotfiles/core.py +++ b/dotfiles/core.py @@ -30,12 +30,12 @@ class Dotfile(object): if not os.path.lexists(self.name): self.status = 'missing' elif os.path.realpath(self.name) != self.target: - self.status = 'unmanaged' + self.status = 'unsynced' def sync(self, force): if self.status == 'missing': os.symlink(self.target, self.name) - elif self.status == 'unmanaged': + elif self.status == 'unsynced': if not force: print "Skipping \"%s\", use --force to override" % self.basename return diff --git a/test_dotfiles.py b/test_dotfiles.py index f9b6b46..8ee3a76 100755 --- a/test_dotfiles.py +++ b/test_dotfiles.py @@ -85,7 +85,7 @@ class DotfilesTestCase(unittest.TestCase): os.path.join(self.homedir, '.bashrc'), os.path.join(target, 'bashrc')) - def test_sync_unmanaged_directory_symlink(self): + def test_force_sync_directory_symlink(self): """Test a forced sync on a directory symlink. A bug was reported where a user wanted to replace a dotfile repository |