rpmbuild-order 0.4.4 → 0.4.4.1
raw patch · 5 files changed
+17/−7 lines, 5 filesPVP ok
version bump matches the API change (PVP)
API changes (from Hackage documentation)
Files
- ChangeLog.md +3/−0
- TODO +3/−0
- rpmbuild-order.cabal +2/−2
- src/Distribution/RPM/Build/Graph.hs +7/−3
- test/Spec.hs +2/−2
ChangeLog.md view
@@ -1,3 +1,6 @@+# 0.4.4.1 (2021-05-19)+- 'render': friendly error message if graphviz is not installed+ # 0.4.4 (2021-05-16) - add 'render' command to display graph graphically with graphviz with an option to output dot format
TODO view
@@ -1,3 +1,6 @@+- --quiet to silence rpmspec warnings+- use record to set createGraph options+ - try topograph - use Set? * warn about uninstalled (specific?) macros packages
rpmbuild-order.cabal view
@@ -1,5 +1,5 @@ Name: rpmbuild-order-Version: 0.4.4+Version: 0.4.4.1 License: BSD3 License-File: LICENSE Author: Jens Petersen <petersen@redhat.com>,@@ -10,7 +10,7 @@ Category: Distribution Homepage: https://github.com/juhp/rpmbuild-order Bug-reports: https://github.com/juhp/rpmbuild-order/issues-Synopsis: Order RPM packages by dependencies+Synopsis: Sort RPM packages in dependency order Description: The rpmbuild-order tool sorts source RPM packages by build dependencies, so that they can be built in a correct order. It does this by reading RPM
src/Distribution/RPM/Build/Graph.hs view
@@ -371,6 +371,10 @@ -- | Render graph with graphviz X11 preview renderGraph :: PackageGraph -> IO ()-renderGraph graph =- let g = G.emap (const ("" :: String)) graph- in runGraphvizCanvas' (setDirectedness graphToDot quickParams g) Xlib+renderGraph graph = do+ gv <- isGraphvizInstalled+ if gv+ then do+ let g = G.emap (const ("" :: String)) graph+ runGraphvizCanvas' (setDirectedness graphToDot quickParams g) Xlib+ else errorWithoutStackTrace "please install graphviz first"
test/Spec.hs view
@@ -9,7 +9,7 @@ main :: IO () main = do setupSymlinks- -- rpmspec < 4.15 does not support "--with"+ -- rpmspec < 4.15.1 does not support "--with" rpmver <- readVersion . last . words <$> cmd "rpmspec" ["--version"] hspec (spec rpmver) @@ -55,7 +55,7 @@ dependencySort [pkg "A", pkg "B/", pkg "D1.0"] >>= (`shouldBe` [pkg "B/", pkg "D1.0", pkg "A"]) - when (rpmver > makeVersion [4,15]) $+ when (rpmver > makeVersion [4,15,1]) $ it "circular A B C boot" $ dependencySortRpmOpts ["--with=boot"] [pkg "A", pkg "B", pkg "C"] >>= (`shouldBe` [pkg "C", pkg "B", pkg "A"])