search for: if_new

...plied\n"; exit 1 ); + (* Chop final '/' in output directory (RHBZ#1146753). *) + let outputdir = + let len = String.length outputdir in + if outputdir.[len - 1] == '/' then String.sub outputdir 0 (len - 1) + else outputdir in debug, mode, if_newer, inputs, lockfile, outputdir, (copy_kernel, dtb_wildcard, format, host_cpu, -- 2.1.0

This is an attempt to make supermin check for the existing results of an output when checking whether the appliance must be rebuilt using --if-newer. At the moment it is implemented only for the ext2 output format of the build mode. Changes from v1: - drop empty stub for the prepare mode - add patch to ignore --if-newer on modes different than build - squash patch with stub for the build mode

This is an attempt to make supermin check for the existing results of an output when checking whether the appliance must be rebuilt using --if-newer. At the moment it is implemented only for the build mode, and for its ext2 output format. Pino Toscano (4): build: factor ext2 filenames Tighten Unix_error check for missing outputdir Extend modes with list of outputs build: set

Hi, to ease debugging issues with appliances (e.g. when used in libguestfs), using --include-packagelist will add a file containing the list of all the packages used. Thanks, Pino Toscano (3): ext2: add ext2fs_chmod and ext2fs_chown chroot: factor out file copy code Add --include-packagelist src/build.ml | 42 +++++++++++++++++++++++++------ src/chroot.ml | 29

...tring list -> string list +(** [get_outputs (args...) inputs] gets the potential outputs for the + appliance. *) diff --git a/src/supermin.ml b/src/supermin.ml index 80c48e6..4091f1d 100644 --- a/src/supermin.ml +++ b/src/supermin.ml @@ -236,10 +236,15 @@ appliance automatically. *) if if_newer then ( try - let odate = (lstat outputdir).st_mtime in + let mode_outputs = + match mode with + | Prepare -> Mode_prepare.get_outputs args inputs + | Build -> Mode_build.get_outputs args inputs in + let mode_outputs = List.map ((//) outputdir) mode_o...

--- src/utils.ml | 21 +++++++++++++++++++++ src/utils.mli | 3 +++ 2 files changed, 24 insertions(+) diff --git a/src/utils.ml b/src/utils.ml index 3e81c21..7ae24bd 100644 --- a/src/utils.ml +++ b/src/utils.ml @@ -204,3 +204,24 @@ let compare_architecture a1 a2 = exit 1 in compare (index_of_architecture a1) (index_of_architecture a2) + +(* Parse a size field, eg. "10G".

Document what each module does, using *.mli files. Remove the --dtb option, it's obsolete. Rename modules according to their purpose. Rich.

...list +(** [get_outputs (args...) inputs] gets the potential outputs for the + appliance. *) diff --git a/src/supermin.ml b/src/supermin.ml index 6e93b83..e923111 100644 --- a/src/supermin.ml +++ b/src/supermin.ml @@ -236,10 +236,12 @@ appliance automatically. *) if mode = Build && if_newer then ( try - let odate = (lstat outputdir).st_mtime in + let outputs = Mode_build.get_outputs args inputs in + let outputs = List.map ((//) outputdir) outputs in + let odates = List.map (fun d -> (lstat d).st_mtime) (outputdir :: outputs) in let idates = List.ma...

...zuma at gmail.com> --- src/supermin.ml | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/src/supermin.ml b/src/supermin.ml index 7c7135b3..b997643 100644 --- a/src/supermin.ml +++ b/src/supermin.ml @@ -236,13 +236,17 @@ appliance automatically. *) if if_newer then ( try - let odate = (lstat outputdir).st_mtime in - let idates = List.map (fun d -> (lstat d).st_mtime) inputs in - let pdate = (get_package_handler ()).ph_get_package_database_mtime () in - if List.for_all (fun idate -> idate < odate) (pdate :: idates) then...

...,7 @@ let main () = let packager_config = match !packager_config with "" -> None | s -> Some s in let use_installed = !use_installed in + let size = !size in let format = match mode, !format with @@ -184,7 +189,7 @@ let main () = debug, mode, if_newer, inputs, lockfile, outputdir, (copy_kernel, dtb_wildcard, format, host_cpu, - packager_config, tmpdir, use_installed) in + packager_config, tmpdir, use_installed, size) in if debug >= 1 then printf "supermin: version: %s\n" Config.package_version; @@ -192,7 +197,7...

...utputs (args...) inputs] gets the potential outputs for the > + appliance. *) > diff --git a/src/supermin.ml b/src/supermin.ml > index 80c48e6..4091f1d 100644 > --- a/src/supermin.ml > +++ b/src/supermin.ml > @@ -236,10 +236,15 @@ appliance automatically. > *) > if if_newer then ( > try > - let odate = (lstat outputdir).st_mtime in > + let mode_outputs = > + match mode with > + | Prepare -> Mode_prepare.get_outputs args inputs > + | Build -> Mode_build.get_outputs args inputs in We actually document that -...

...+ let tmpdir = Filename.temp_file "supermin" ".tmpdir" in + unlink tmpdir; + mkdir tmpdir 0o700; + at_exit + (fun () -> + let cmd = sprintf "rm -rf %s" (quote tmpdir) in + ignore (Sys.command cmd)); + tmpdir in + + let debug, mode, if_newer, inputs, lockfile, outputdir, args = + let display_version () = + printf "supermin %s\n" Config.package_version; + exit 0 in - let rec loop = function - | [] -> [] - | (name1, _, _ as f1) :: (name2, _, _ as f2) :: fs when name1 = name2 -> -...