search for: cache_of_name

...; 0 then Hashtbl.replace nseen id revision with Not_found -> Hashtbl.add nseen id revision diff --git a/builder/cache.ml b/builder/cache.ml index e73bcfd..8b63a86 100644 --- a/builder/cache.ml +++ b/builder/cache.ml @@ -40,7 +40,7 @@ let create ~directory = } let cache_of_name t name arch revision = - t.directory // sprintf "%s.%s.%d" name arch revision + t.directory // sprintf "%s.%s.%s" name arch (string_of_revision revision) let is_cached t name arch revision = let filename = cache_of_name t name arch revision in diff --git a/builder/cache....

On Tuesday 11 March 2014 10:09:45 Richard W.M. Jones wrote: > On Mon, Mar 10, 2014 at 02:28:20PM +0100, Pino Toscano wrote: > > Add the possibility to choose which architecture use to build the > > wanted image (--arch). Since this implies that running commands on > > the guest is usually not possible when the architecture is > > different than the host one, another new

...ri; let progress_bar = not (quiet ()) in Downloader.download downloader ~template ~progress_bar ~proxy diff --git a/builder/cache.ml b/builder/cache.ml index dbd222fda..d2693b943 100644 --- a/builder/cache.ml +++ b/builder/cache.ml @@ -41,7 +41,9 @@ let create ~directory = } let cache_of_name t name arch revision = - t.directory // sprintf "%s.%s.%s" name arch (string_of_revision revision) + t.directory // sprintf "%s.%s.%s" name + (Index.string_of_arch arch) + (string_of_revision revision) le...

...y: %s\n") cachedir; List.iter ( - fun (name, { Index_parser.revision = revision; hidden = hidden }) -> + fun (name, { Index_parser.revision = revision; arch = arch; hidden = hidden }) -> if not hidden then ( - let filename = Downloader.cache_of_name cachedir name revision in + let filename = Downloader.cache_of_name cachedir name arch revision in let cached = Sys.file_exists filename in - printf "%-24s %s\n" name + printf "%-24s %-10s %s\n" name arch (if...

...i; let progress_bar = not (quiet ()) in Downloader.download downloader ~template ~progress_bar ~proxy diff --git a/builder/cache.ml b/builder/cache.ml index dbd222fda..c4a6b0578 100644 --- a/builder/cache.ml +++ b/builder/cache.ml @@ -41,6 +41,11 @@ let create ~directory = } let cache_of_name t name arch revision = + let arch = + match arch with + | Either arch + | Or Some arch -> arch + | Or None -> "" in t.directory // sprintf "%s.%s.%s" name arch (string_of_revision revision) let is_cached t name arch revision = @@ -54,6 +59,11 @@ let prin...

...i; let progress_bar = not (quiet ()) in Downloader.download downloader ~template ~progress_bar ~proxy diff --git a/builder/cache.ml b/builder/cache.ml index dbd222fda..e313a8bcf 100644 --- a/builder/cache.ml +++ b/builder/cache.ml @@ -41,6 +41,10 @@ let create ~directory = } let cache_of_name t name arch revision = + let arch = + match arch with + | Index.Arch arch + | Index.GuessedArch arch -> arch in t.directory // sprintf "%s.%s.%s" name arch (string_of_revision revision) let is_cached t name arch revision = @@ -54,6 +58,10 @@ let print_item_status t ~hea...

Hi, this series adds a basic support for Simple Streams v1.0 metadata files. This makes it possible to create a repository .conf files with [cirros] uri=http://download.cirros-cloud.net format=simplestreams to read the latest version of each CirrOS image. TODO items: - check the pasted metadata: listing and creating images works, so most of the current metadata is correct - possibly wait

Hi, this series adds a basic support for Simple Streams v1.0 metadata files. This makes it possible to create a repository .conf files with [cirros] uri=http://download.cirros-cloud.net format=simplestreams to read the latest version of each CirrOS image. Thanks, Pino Toscano (4): builder: add non-int revisions builder: add simple libyajl binding build: expose HAVE_YAJL to automake

Hey there, Here is an update of the series. The changes: * Incorporate Richard's comments. Left out the with_openfile one since that leads to a double close. * Change the ask option return type to string (removing the option) since if the use doesn't input anything we're using the default, and the default is now a mandatory parameter. * Make sure there are items in the

Hi there! Here is the latest version of the series including Richard's comments. I also reworked the repository_main.ml code to avoid setting an empty entry if not found. Cédric Bosdonnat (3): builder: change arch type to distinguish guesses builder: add a template parameter to get_index New tool: virt-builder-repository .gitignore | 4 +

...y uri tmpfile; (tmpfile, true) | Some (name, arch, revision) -> match t.cache with | None -> (* Not using the cache at all? *) - download t ?progress_bar ~proxy uri + download t ?progress_bar ?proxy uri | Some cache -> let filename = Cache.cache_of_name cache name arch revision in @@ -63,11 +58,11 @@ let rec download t ?template ?progress_bar ?(proxy = SystemProxy) uri = * If not, download it. *) if not (Sys.file_exists filename) then - download_to t ?progress_bar ~proxy uri filename; + download_to t ?progress_...

Hi all, Here is the latest version of the series. Diffs to v10: * Make Index.arch a (string, string option) maybe and use it to guess arch at parse time * Compute the image size at parse time when the template flag is set and the value is missing. * Add virt-repository_main slow test * Other fixes from Richard's comments Cédric Bosdonnat (7): Ignore builder/*.out and *.img

Move the Curl wrapper module from virt-v2v to mllib. Use the module when virt-builder issues curl calls. Rich.

v1 -> v2: - Fixed the bug with precedence of if / @. - Add some imperative list operators inspired by Perl, and use those for constructing the Curl arguments, and more. Rich.

.. and a lot of refactoring. https://bugzilla.redhat.com/show_bug.cgi?id=1167623 Rich.

https://bugzilla.redhat.com/show_bug.cgi?id=1167623

...7edc670 100644 --- a/builder/cache.mli +++ b/builder/cache.mli @@ -24,7 +24,7 @@ val clean_cachedir : string -> unit type t (** The abstract data type. *) -val create : verbose:bool -> directory:string -> t +val create : directory:string -> t (** Create the abstract type. *) val cache_of_name : t -> string -> string -> int -> string diff --git a/builder/cmdline.ml b/builder/cmdline.ml index 61a5cb8..1ae5d97 100644 --- a/builder/cmdline.ml +++ b/builder/cmdline.ml @@ -94,8 +94,6 @@ let parse_cmdline () = let add_source arg = sources := arg :: !sources in let sync = re...