diff options
| -rw-r--r-- | Assistant/Sync.hs | 27 | ||||
| -rw-r--r-- | debian/changelog | 1 |
2 files changed, 16 insertions, 12 deletions
diff --git a/Assistant/Sync.hs b/Assistant/Sync.hs index 1e94335ef..ccc359672 100644 --- a/Assistant/Sync.hs +++ b/Assistant/Sync.hs @@ -43,18 +43,21 @@ reconnectRemotes notifypushes rs = void $ do =<< liftAnnex (inRepo Git.Branch.current) addScanRemotes diverged rs return ok - where - (gitremotes, _specialremotes) = - partition (Git.repoIsUrl . Remote.repo) rs - sync (Just branch) = do - diverged <- snd <$> manualPull (Just branch) gitremotes - now <- liftIO getCurrentTime - ok <- pushToRemotes now notifypushes gitremotes - return (ok, diverged) - {- No local branch exists yet, but we can try pulling. -} - sync Nothing = do - diverged <- snd <$> manualPull Nothing gitremotes - return (True, diverged) + where + gitremotes = filter (notspecialremote . Remote.repo) rs + notspecialremote r + | Git.repoIsUrl r = True + | Git.repoIsLocal r = True + | otherwise = False + sync (Just branch) = do + diverged <- snd <$> manualPull (Just branch) gitremotes + now <- liftIO getCurrentTime + ok <- pushToRemotes now notifypushes gitremotes + return (ok, diverged) + {- No local branch exists yet, but we can try pulling. -} + sync Nothing = do + diverged <- snd <$> manualPull Nothing gitremotes + return (True, diverged) {- Updates the local sync branch, then pushes it to all remotes, in - parallel, along with the git-annex branch. This is the same diff --git a/debian/changelog b/debian/changelog index 36a7253a6..4d68c0cfd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -34,6 +34,7 @@ git-annex (3.20121018) UNRELEASED; urgency=low * The standalone tarball's runshell now takes care of installing a ~/.ssh/git-annex-shell wrapper the first time it's run. * webapp: Make an initial, empty commit so there is a master branch + * assistant: Fix syncing local drives. -- Joey Hess <joeyh@debian.org> Wed, 17 Oct 2012 14:24:10 -0400 |