From db3975fb4b9ba35f6f07900af615bd01857c8c0c Mon Sep 17 00:00:00 2001
From: Julien Grossholtz <julien.grossholtz@savoirfairelinux.com>
Date: Mon, 19 Oct 2015 13:43:13 -0400
Subject: [PATCH] packaging: fix json file
Remove comma's after last elements in tables. This was preventing python
from loading the json file.
Issue: #80115
Change-Id: Ia7dad4b1fa01caf2496b43fac5eff950cd380a04
---
.packer.json | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/.packer.json b/.packer.json
index d92ddfa4bd..503167ddb0 100644
--- a/.packer.json
+++ b/.packer.json
@@ -123,7 +123,7 @@
"dpkg-buildpackage -uc -us",
"cd .. ",
"mv *.orig.tar* *.debian.tar* *deb *changes *dsc /output"
- ],
+ ]
},
"UpdateInstructions" : {
"fedora_21" : ["yum upgrade -y"],
@@ -137,7 +137,7 @@
"ubuntu_14.04_i386": ["apt-get update", "( apt-get upgrade -y || apt-get upgrade -y || apt-get upgrade -y )"],
"ubuntu_15.04_i386": ["apt-get update", "( apt-get upgrade -y || apt-get upgrade -y || apt-get upgrade -y )"],
"ubuntu_15.10": ["apt-get update", "( apt-get upgrade -y || apt-get upgrade -y || apt-get upgrade -y )"],
- "ubuntu_15.10_i386": ["apt-get update", "( apt-get upgrade -y || apt-get upgrade -y || apt-get upgrade -y )"],
+ "ubuntu_15.10_i386": ["apt-get update", "( apt-get upgrade -y || apt-get upgrade -y || apt-get upgrade -y )"]
},
"ReviewType": "",
"ReviewAddress": "https://gerrit-ring.savoirfairelinux.com",
@@ -153,12 +153,12 @@
"ubuntu_15.10": "",
"ubuntu_14.04_i386": "",
"ubuntu_15.04_i386": "",
- "ubuntu_15.10_i386": "",
+ "ubuntu_15.10_i386": ""
},
"ReloadProjectCmd" : [
"git checkout packaging",
"git reset --hard origin/packaging",
- "git pull",
+ "git pull"
],
"AutoDeploySchedule": {
"fedora_21" : "@midnight",
@@ -172,7 +172,7 @@
"ubuntu_15.10": "@midnight",
"ubuntu_14.04_i386": "@midnight",
"ubuntu_15.04_i386": "@midnight",
- "ubuntu_15.10_i386": "@midnight",
+ "ubuntu_15.10_i386": "@midnight"
},
"DeployScript": "ring-nightly-sign-deploy.sh",
"NotificationMailAdress": ["Awesome Ring Team", "ring-dev@lists.savoirfairelinux.net"]
--
GitLab