diff options
| -rw-r--r-- | Assistant.hs | 2 | ||||
| -rw-r--r-- | Assistant/DaemonStatus.hs | 2 | ||||
| -rw-r--r-- | Assistant/Threads/MountWatcher.hs | 2 | ||||
| -rw-r--r-- | Assistant/Threads/NetWatcher.hs | 2 | ||||
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | doc/bugs/The_webapp_doesn__39__t_allow_deleting_repositories.mdwn | 2 |
6 files changed, 8 insertions, 4 deletions
diff --git a/Assistant.hs b/Assistant.hs index 0b89369b0..630f3685b 100644 --- a/Assistant.hs +++ b/Assistant.hs @@ -157,6 +157,7 @@ import Assistant.Environment import qualified Utility.Daemon import Utility.LogFile import Utility.ThreadScheduler +import qualified Build.SysConfig as SysConfig stopDaemon :: Annex () stopDaemon = liftIO . Utility.Daemon.stopDaemon =<< fromRepo gitAnnexPidFile @@ -198,6 +199,7 @@ startDaemon assistant foreground startbrowser = do =<< newAssistantData st dstatus go webappwaiter = do + notice ["starting", desc, "version", SysConfig.packageversion] #ifdef WITH_WEBAPP d <- getAssistant id urlrenderer <- liftIO newUrlRenderer diff --git a/Assistant/DaemonStatus.hs b/Assistant/DaemonStatus.hs index 6c71c60eb..774580f86 100644 --- a/Assistant/DaemonStatus.hs +++ b/Assistant/DaemonStatus.hs @@ -53,8 +53,6 @@ calcSyncRemotes = do let good r = Remote.uuid r `elem` alive let syncable = filter good rs let nonxmpp = filter (not . isXMPPRemote) syncable - - liftIO $ print (nonxmpp, map Remote.globallyAvailable nonxmpp) return $ \dstatus -> dstatus { syncRemotes = syncable diff --git a/Assistant/Threads/MountWatcher.hs b/Assistant/Threads/MountWatcher.hs index 143ae9cee..c03eac4f1 100644 --- a/Assistant/Threads/MountWatcher.hs +++ b/Assistant/Threads/MountWatcher.hs @@ -157,7 +157,7 @@ handleMount :: FilePath -> Assistant () handleMount dir = do debug ["detected mount of", dir] rs <- filter (Git.repoIsLocal . Remote.repo) <$> remotesUnder dir - reconnectRemotes True rs + reconnectRemotes True $ filter (not . remoteAnnexIgnore . Remote.gitconfig) rs {- Finds remotes located underneath the mount point. - diff --git a/Assistant/Threads/NetWatcher.hs b/Assistant/Threads/NetWatcher.hs index 6ac7203b0..6d15d414e 100644 --- a/Assistant/Threads/NetWatcher.hs +++ b/Assistant/Threads/NetWatcher.hs @@ -128,4 +128,4 @@ handleConnection = reconnectRemotes True =<< networkRemotes {- Finds network remotes. -} networkRemotes :: Assistant [Remote] networkRemotes = liftAnnex $ - filter (isNothing . Remote.localpath) <$> remoteList + filter (isNothing . Remote.localpath) <$> enabledRemoteList diff --git a/debian/changelog b/debian/changelog index 0df456a87..b79be5309 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,6 +17,8 @@ git-annex (4.20130315) UNRELEASED; urgency=low * map: Combine duplicate repositories, for a nicer looking map. * Fix several bugs caused by a bad Ord instance for Remote. * webapp: Switch all forms to POST. + * assistant: Avoid syncing with annex-ignored remotes when reconnecting + to the network, or connecting a drive. -- Joey Hess <joeyh@debian.org> Fri, 15 Mar 2013 00:10:07 -0400 diff --git a/doc/bugs/The_webapp_doesn__39__t_allow_deleting_repositories.mdwn b/doc/bugs/The_webapp_doesn__39__t_allow_deleting_repositories.mdwn index b8973b33b..f90b88c95 100644 --- a/doc/bugs/The_webapp_doesn__39__t_allow_deleting_repositories.mdwn +++ b/doc/bugs/The_webapp_doesn__39__t_allow_deleting_repositories.mdwn @@ -19,3 +19,5 @@ What version of git-annex are you using? On what operating system? Description: Ubuntu 12.04.1 LTS Release: 12.04 Codename: precise + +[[!tag /design/assistant]] |