kameleon-builder 2.6.6 → 2.6.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 01ed0528903cb0ab65cba07d600b98c77d6abeb7
4
- data.tar.gz: d219bb864c9a7212e8b3f771706fa2b0d940f883
3
+ metadata.gz: 41ec4253d5c8e1212274257dd0ef731fd911680c
4
+ data.tar.gz: 9f6a9adf0e0764e352d2968ade87478d8c9c82a5
5
5
  SHA512:
6
- metadata.gz: 5c57e8ad6f6a0f64bf97ebfff98b4b8c28c0b09a8e1709bfee852525b282f52b454c42f135886bf1db17100bda91dfc9b79b2fe064f61136fc13ea0d4d8fdbc7
7
- data.tar.gz: 84ff37f3f6cf1536e02fd5ed5829209fadec0db232769a1cc9da6056232cf9384bf4e1610d8d203a4bea811ed69f96b346e6088b244fe76d46f1e7b921b6743c
6
+ metadata.gz: ecd9d831258ff4d46e034e740221c4dc3cf5a10b8e66e711bec447b9fbc417f3519b019e930d503ee2d9791ec5b2d14c412b357bf41cee617e3a7f52009c733b
7
+ data.tar.gz: 31575ddef96d63072c0d2d4a8ab391a989eaf871a2fce7e7d5bc89babe03febfb1059330fe5b6221bd94fd71c3952ff15ccec5a5e05bfa122d24edff3a2bce4c
data/.bumpversion.cfg CHANGED
@@ -1,7 +1,7 @@
1
1
  [bumpversion]
2
2
  commit = True
3
3
  tag = True
4
- current_version = 2.6.6
4
+ current_version = 2.6.7
5
5
  parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\.(?P<release>[a-z]+))?
6
6
  serialize =
7
7
  {major}.{minor}.{patch}.{release}
data/CHANGES CHANGED
@@ -1,6 +1,15 @@
1
1
  Kameleon CHANGELOG
2
2
  ==================
3
3
 
4
+ Version 2.6.7
5
+ -------------
6
+
7
+ Released on October 01st 2015
8
+
9
+ - Decreased polipo exit timeout (120 to 5s)
10
+ - Passed only recipe files (not directories) to the cache to fixed persistant cache crash
11
+
12
+
4
13
  Version 2.6.6
5
14
  -------------
6
15
 
@@ -47,8 +47,6 @@ module Kameleon
47
47
  @cache.name = @recipe.name
48
48
  @cache.mode = @options[:enable_cache] ? :build : :from
49
49
  @cache.cache_path = @options[:from_cache]
50
- # I'm passing the Pathname objects
51
- @cache.recipe_files = @recipe.all_files
52
50
  @cache.recipe_path = @recipe.path
53
51
  @cache.archive_format = @options[:cache_archive_compression]
54
52
  if @options[:proxy] != ""
@@ -72,6 +70,10 @@ module Kameleon
72
70
 
73
71
  @recipe.resolve!
74
72
 
73
+ if @options[:enable_cache] || @options[:from_cache] then
74
+ @cache.recipe_files = @recipe.all_files
75
+ end
76
+
75
77
  begin
76
78
  Kameleon.ui.info("Creating kameleon build directory : #{@cwd}")
77
79
  FileUtils.mkdir_p @cwd
@@ -199,7 +199,7 @@ module Kameleon
199
199
 
200
200
  def stop()
201
201
  begin
202
- @polipo_process.poll_for_exit(120)
202
+ @polipo_process.poll_for_exit(5)
203
203
  rescue ChildProcess::TimeoutError
204
204
  @polipo_process.stop # tries increasingly harsher methods to kill the process.
205
205
  end
data/version.txt CHANGED
@@ -1 +1 @@
1
- 2.6.6
1
+ 2.6.7
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: kameleon-builder
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.6.6
4
+ version: 2.6.7
5
5
  platform: ruby
6
6
  authors:
7
7
  - Salem Harrache
@@ -12,7 +12,7 @@ authors:
12
12
  autorequire:
13
13
  bindir: bin
14
14
  cert_chain: []
15
- date: 2015-09-14 00:00:00.000000000 Z
15
+ date: 2015-10-01 00:00:00.000000000 Z
16
16
  dependencies:
17
17
  - !ruby/object:Gem::Dependency
18
18
  name: childprocess