fix typo and push v2.2.6

antoineco · antoineco · commit 79662f523f17 · 2015-06-18T23:44:15.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,4 @@
-###2.2.5
+###2.2.6
 
 Fix conflict introduced by [nanliu-archive](https://forge.puppetlabs.com/nanliu/archive/changelog) v0.3.0
 
diff --git a/manifests/download.pp b/manifests/download.pp
@@ -31,7 +31,7 @@
   }
 
   # download archive
-  if $oracle_java::format == 'rpm' {
+  if $oracle_java::format_real == 'rpm' {
     archive { "/usr/java/${oracle_java::filename}":
       cookie  => 'oraclelicense=accept-securebackup-cookie',
       source  => $oracle_java::downloadurl,
diff --git a/metadata.json b/metadata.json
@@ -5,7 +5,7 @@
   "project_page": "https://github.com/antoineco/aco-oracle_java",
   "source": "git://github.com/antoineco/aco-oracle_java.git",
   "summary": "Puppet module to install Oracle Java on Linux systems",
-  "version": "2.2.5",
+  "version": "2.2.6",
   "tags": ["jre","jdk","oracle","java"],
   "dependencies": [
     {

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-###2.2.5`
	`1`	`+###2.2.6`
`2`	`2`
`3`	`3`	`Fix conflict introduced by [nanliu-archive](https://forge.puppetlabs.com/nanliu/archive/changelog) v0.3.0`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`# download archive`
`34`		`- if $oracle_java::format == 'rpm' {`
	`34`	`+ if $oracle_java::format_real == 'rpm' {`
`35`	`35`	`archive { "/usr/java/${oracle_java::filename}":`
`36`	`36`	`cookie => 'oraclelicense=accept-securebackup-cookie',`
`37`	`37`	`source => $oracle_java::downloadurl,`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`"project_page": "https://github.com/antoineco/aco-oracle_java",`
`6`	`6`	`"source": "git://github.com/antoineco/aco-oracle_java.git",`
`7`	`7`	`"summary": "Puppet module to install Oracle Java on Linux systems",`
`8`		`- "version": "2.2.5",`
	`8`	`+ "version": "2.2.6",`
`9`	`9`	`"tags": ["jre","jdk","oracle","java"],`
`10`	`10`	`"dependencies": [`
`11`	`11`	`{`