From aada1d9897b2df4bb10c39707a01b5752e4de27f Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 2 Mar 2015 13:30:26 +0000 Subject: [PATCH] fedora: Move fedora_* configuration into Config module. Just code motion. --- config.ml | 6 ++++++ fedora.ml | 6 +----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/config.ml b/config.ml index 11734d3..e5550e4 100644 --- a/config.ml +++ b/config.ml @@ -8,6 +8,12 @@ open Printf (* General. *) let buildtmp = sprintf "%s/tmp/builds" (Sys.getenv "HOME") +(* Fedora *) +let fedora_dir = Sys.getenv "HOME" // "d/fedora" +let fedora_repo pkg branch = fedora_dir // pkg // branch +let fedora_specfile pkg branch = + sprintf "%s/%s.spec" (fedora_repo pkg branch) pkg + (* libguestfs *) let libguestfs_query_mins = 60 diff --git a/fedora.ml b/fedora.ml index 6575dbf..b40a67c 100644 --- a/fedora.ml +++ b/fedora.ml @@ -5,11 +5,7 @@ open Printf open Goaljobs -(* Repo dir, etc. *) -let fedora_dir = Sys.getenv "HOME" // "d/fedora" -let fedora_repo pkg branch = fedora_dir // pkg // branch -let fedora_specfile pkg branch = - sprintf "%s/%s.spec" (fedora_repo pkg branch) pkg +open Config (* Get the current version of a package. *) let fedora_verrel pkg branch = -- 1.8.3.1