diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-11-24 00:26:20 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-11-24 00:26:20 -0400 |
| commit | 49f6892455e72edfc05da848de20b644ebf5a852 (patch) | |
| tree | e2c305268c655d96e6e913306a1737a78437d71d | |
| parent | 3711edf33110923c1e58663b6703698ffa93c8f5 (diff) | |
linux upgrade code debugged and working
| -rw-r--r-- | Assistant/Threads/TransferWatcher.hs | 6 | ||||
| -rw-r--r-- | Build/BundledPrograms.hs | 5 |
2 files changed, 8 insertions, 3 deletions
diff --git a/Assistant/Threads/TransferWatcher.hs b/Assistant/Threads/TransferWatcher.hs index 1c1e470f9..cd7282865 100644 --- a/Assistant/Threads/TransferWatcher.hs +++ b/Assistant/Threads/TransferWatcher.hs @@ -91,9 +91,9 @@ onDel file = case parseTransferFile file of minfo <- removeTransfer t -- Run transfer hook. - void $ maybe noop (\hook -> void $ forkIO $ hook t) - . M.lookup (transferKey t) - . transferHook <$> getDaemonStatus + m <- transferHook <$> getDaemonStatus + maybe noop (\hook -> void $ liftIO $ forkIO $ hook t) + (M.lookup (transferKey t) m) finished <- asIO2 finishedTransfer void $ liftIO $ forkIO $ do diff --git a/Build/BundledPrograms.hs b/Build/BundledPrograms.hs index 87232ebec..3c53f06fb 100644 --- a/Build/BundledPrograms.hs +++ b/Build/BundledPrograms.hs @@ -45,6 +45,11 @@ bundledPrograms = catMaybes , SysConfig.sha512 , SysConfig.sha224 , SysConfig.sha384 +#ifdef linux_HOST_OS + -- used to unpack the tarball when upgrading + , Just "gunzip" + , Just "tar" +#endif -- nice and ionice are not included in the bundle; we rely on the -- system's own version, which may better match its kernel ] |