[commit: Cabal] master: Clean up some warnings (5c0037d)

[Ian Lynagh]

Repository : ssh://darcs.haskell.org//srv/darcs/packages/Cabal

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/5c0037d4775428f5c8c811237f27d632d0e9cbe6

>---------------------------------------------------------------

commit 5c0037d4775428f5c8c811237f27d632d0e9cbe6
Author: Duncan Coutts <duncan at haskell.org>
Date:   Tue Aug 12 21:31:31 2008 +0000

    Clean up some warnings

>---------------------------------------------------------------

 .../Distribution/Client/BuildReports/Upload.hs     |    1 +
 cabal-install/Distribution/Client/Upload.hs        |   15 ++++++---------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/cabal-install/Distribution/Client/BuildReports/Upload.hs b/cabal-install/Distribution/Client/BuildReports/Upload.hs
index 861e3b7..f803532 100644
--- a/cabal-install/Distribution/Client/BuildReports/Upload.hs
+++ b/cabal-install/Distribution/Client/BuildReports/Upload.hs
@@ -55,6 +55,7 @@ postBuildReport uri buildReport = do
 
 putBuildLog :: BuildReportId -> BuildLog -> BrowserAction ()
 putBuildLog reportId buildLog = do
+  --FIXME: do something if the request fails
   (_, response) <- request Request {
       rqURI     = reportId{uriPath = uriPath reportId </> "buildlog"},
       rqMethod  = PUT,
diff --git a/cabal-install/Distribution/Client/Upload.hs b/cabal-install/Distribution/Client/Upload.hs
index 608ee9d..159ce99 100644
--- a/cabal-install/Distribution/Client/Upload.hs
+++ b/cabal-install/Distribution/Client/Upload.hs
@@ -13,7 +13,6 @@ import Distribution.Client.Config
 
 import qualified Distribution.Client.BuildReports.Anonymous as BuildReport
 import qualified Distribution.Client.BuildReports.Upload as BuildReport
-import qualified Distribution.Client.BuildReports.Storage as BuildReport
 
 import Network.Browser
          ( BrowserAction, browse, request
@@ -30,8 +29,8 @@ import System.IO        (hFlush, stdin, stdout, hGetEcho, hSetEcho
                         ,openBinaryFile, IOMode(ReadMode), hGetContents)
 import Control.Exception (bracket)
 import System.Random    (randomRIO)
-import System.FilePath
-import qualified System.FilePath.Posix as FilePath.Posix
+import System.FilePath  ((</>), takeExtension)
+import qualified System.FilePath.Posix as FilePath.Posix (combine)
 import System.Directory
 import Control.Monad (forM_)
 
@@ -62,7 +61,7 @@ upload verbosity repos mUsername mPassword paths = do
             notice verbosity $ "Uploading " ++ path ++ "... "
             handlePackage verbosity uploadURI auth path
   where
-    targetRepoURI = remoteRepoURI $ selectUploadRepo [ remoteRepo | Left remoteRepo <- map repoKind repos ]
+    targetRepoURI = remoteRepoURI $ last [ remoteRepo | Left remoteRepo <- map repoKind repos ] --FIXME: better error message when no repos are given
     promptUsername :: IO Username
     promptUsername = do
       putStr "Hackage username: "
@@ -78,8 +77,6 @@ upload verbosity repos mUsername mPassword paths = do
         hSetEcho stdin False  -- no echoing for entering the password
         fmap Password getLine
 
-selectUploadRepo = last -- Use head?
-
 report :: Verbosity -> [Repo] -> IO ()
 report verbosity repos
     = forM_ repos $ \repo ->
@@ -93,9 +90,9 @@ report verbosity repos
                          let (reportStr, buildLog) = read inp :: (String,String)
                          case BuildReport.parse reportStr of
                            Left errs -> do warn verbosity $ "Errors: " ++ errs -- FIXME
-                           Right report ->
-                               do info verbosity $ "Uploading report for " ++ display (BuildReport.package report)
-                                  browse $ BuildReport.uploadReports (remoteRepoURI remoteRepo) [(report, Just buildLog)]
+                           Right report' ->
+                               do info verbosity $ "Uploading report for " ++ display (BuildReport.package report')
+                                  browse $ BuildReport.uploadReports (remoteRepoURI remoteRepo) [(report', Just buildLog)]
                                   return ()
         Right{} -> return ()