packages feed

dl-fedora 2.0 → 2.0.1

raw patch · 5 files changed

+26/−18 lines, 5 files

Files

CHANGELOG.md view
@@ -1,5 +1,8 @@ # Changelog +## 2.0.1 (2025-03-11)+- 'stage' and 'test' releases also need to follow Kiwi editions+ ## 2.0 (2025-03-07) - move short `-d` option from `--dl` to `--dir` - simplify the download dir logic
README.md view
@@ -72,19 +72,19 @@ `$ dl-fedora --version`  ```-2.0+2.0.1 ``` `$ dl-fedora --help`  ``` Fedora iso downloader -Usage: dl-fedora [--version] [-g|--gpg-keys] [--no-checksum | --checksum]-                 [--debug] [-T|--no-http-timeout]-                 [(-c|--check) | (-l|--local) | --list | (-R|--replace)]-                 [-d|--dir DIRECTORY] [-n|--dry-run] [-r|--run]-                 [(-L|--latest) | --dl | (-k|--koji) | (-m|--mirror URL)]-                 [--dvd] [--cs-devel | --cs-test | --cs-production]+Usage: dl-fedora [--version] [-g|--gpg-keys] [--no-checksum | --checksum] +                 [--debug] [-T|--no-http-timeout] +                 [(-c|--check) | (-l|--local) | --list | (-R|--replace)] +                 [-d|--dir DIRECTORY] [-n|--dry-run] [-r|--run] +                 [(-L|--latest) | --dl | (-k|--koji) | (-m|--mirror URL)] +                 [--dvd] [--cs-devel | --cs-test | --cs-production]                   [--alt-cs-extra-edition ('MAX'|'MIN')] [-a|--arch ARCH] RELEASE                  [--all-desktops | --all-spins | --all-editions | [-x|--exclude]                    [EDITION...]]
dl-fedora.cabal view
@@ -1,6 +1,6 @@ cabal-version:       1.18 name:                dl-fedora-version:             2.0+version:             2.0.1 synopsis:            Fedora image download tool description:             Tool to download Fedora and Centos Stream iso and image files.
src/Main.hs view
@@ -90,10 +90,9 @@  showEdition :: Release -> FedoraEdition -> String showEdition rel KDE =-  case rel of-    Rawhide -> "KDE-Desktop"-    Fedora r | r >= 42 -> "KDE-Desktop"-    _ -> "KDE"+  if fedoraVerOrLater 42 rel+  then "KDE-Desktop"+  else "KDE" showEdition _ KDEMobile = "KDE-Mobile" showEdition _ MATE = "MATE_Compiz" showEdition _ Miracle = "MiracleWM"@@ -130,6 +129,8 @@ fedoraVerOrLater :: Natural -> Release -> Bool fedoraVerOrLater _ Rawhide = True fedoraVerOrLater n (Fedora m) = m >= n+fedoraVerOrLater _ FedoraStage = True+fedoraVerOrLater _ FedoraTest = True fedoraVerOrLater _ _ = False  allSpins :: Natural -> Natural -> Release -> [FedoraEdition]
test/tests.hs view
@@ -44,14 +44,18 @@     ,["-T", "-n", "c10s-live", "--all-editions"]     ] +mkFedEdition :: String -> [String]+mkFedEdition ver =+  ["--dl", "-T", "-n", ver, "--all-editions"]+ allFedoraEditions :: Natural -> Natural -> [[String]] allFedoraEditions oldest rawhide =-  let mkFedEd rel = ["--dl", "-T", "-n", show rel, "--all-editions"]-  in-    map mkFedEd [oldest..(rawhide-1)]-    ++-    -- currently MATE is broken in Rawhide-    [["--dl", "-T", "-n", show rawhide, "--exclude", "mate"]]+  map (mkFedEdition . show) [oldest..(rawhide-1)]+  +++  [mkFedEdition "stage"]+  +++  -- currently MATE is broken in Rawhide+  [["--dl", "-T", "-n", show rawhide, "--exclude", "mate"]]  allEditions :: Natural -> [String] allEditions 9 = allEditions 10 ++ ["cinnamon", "mate", "xfce"]