koji-tool 0.9.4 → 0.9.5

raw patch · 7 files changed

+12/−19 lines, 7 files

Files

• ChangeLog.md +4/−0
• README.md +1/−1
• koji-tool.cabal +1/−1
• src/Install.hs +1/−1
• src/Progress.hs +2/−1
• src/Tasks.hs +1/−1
• src/Utils.hs +2/−14

@@ -1,5 +1,9 @@ # Version history of koji-tool +## 0.9.5 (2022-09-12)+- 'install': fix determination of package name from srpm+- 'progress': correctly determine NVR from srpm again+ ## 0.9.4 (2022-09-09) - 'install': rework install logic to combine reinstall and install pkgs - 'install': do not choose rebuildSRPM subtask

@@ -23,7 +23,7 @@ ## Commands ```shellsession $ koji-tool --version-0.9.4+0.9.5 $ koji-tool --help Query and track Koji tasks, and install rpms from Koji. 

@@ -1,5 +1,5 @@ name:                koji-tool-version:             0.9.4+version:             0.9.5 synopsis:            Koji CLI tool for querying tasks and installing builds description:         koji-tool is a CLI interface to Koji with commands to query

@@ -198,7 +198,7 @@                 case find ((== "src") . rpmArch) nvras of                   Just src -> return $ rpmName src                   Nothing ->-                    return $ kojiTaskRequestPkg archtask+                    return $ either id nvrName $ kojiTaskRequestNVR archtask   if listmode     then do     drpms <- decideRpms yes listmode existingStrategy select prefix nvras

@@ -29,6 +29,7 @@ #if !MIN_VERSION_base(4,11,0) import Data.Monoid ((<>)) #endif+import Data.RPM.NVR import Data.Time (diffUTCTime, getCurrentTime, getCurrentTimeZone,                   localTimeOfDay, NominalDiffTime, nominalDiffTimeToSeconds,                   TimeZone, utcToLocalTime)@@ -150,7 +151,7 @@           statuses <- mapM (buildlogSize debug 0) tasks           end <- maybe getCurrentTime return mend           let header =-                let pkg = kojiTaskRequestPkg task+                let pkg = either id showNVR $ kojiTaskRequestNVR task                     duration = diffUTCTime end start                 in                   -- FIXME mostly redundant for a single build task

@@ -200,7 +200,7 @@       taskid <- lookupStruct "id" st       method <- lookupStruct "method" st       state <- getTaskState st-      let pkgnvr = kojiTaskRequestPkgNVR st+      let pkgnvr = kojiTaskRequestNVR st           mparent' = lookupStruct "parent" st :: Maybe Int       return $         TaskResult pkgnvr arch method state mparent' taskid mstart_time mend_time

@@ -1,7 +1,5 @@ module Utils (   kojiTaskRequestNVR,-  kojiTaskRequestPkgNVR,-  kojiTaskRequestPkg,   kojiGetBuildID',   kojiGetBuild',   showValue,@@ -21,17 +19,10 @@ import SimpleCmd (error') import System.FilePath (takeBaseName) -kojiTaskRequestNVR :: Struct -> Maybe NVR-kojiTaskRequestNVR  task =-  case lookupStruct "request" task of-    Just (srpm:_) ->-      getString srpm >>= fmap dropArch . maybeNVRA-    _ -> Nothing- -- FIXME this should really be a triple -- FIXME should not use on build-kojiTaskRequestPkgNVR :: Struct -> Either String NVR-kojiTaskRequestPkgNVR task =+kojiTaskRequestNVR :: Struct -> Either String NVR+kojiTaskRequestNVR task =   case lookupStruct "request" task of     Just req@(source:_) ->       case getString source of@@ -48,9 +39,6 @@                    then takeWhileEnd (/= ':') $ tail $ dropWhile (/= ';') base                    else base     _ -> error' "could determine package from build request"--kojiTaskRequestPkg :: Struct -> String-kojiTaskRequestPkg = either id showNVR . kojiTaskRequestPkgNVR  kojiGetBuildID' :: String -> String -> IO BuildID kojiGetBuildID' hub nvr = do