Gentoo Archives: gentoo-commits

From: "Miroslav Šulc" <fordfrog@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/java-ebuilder:master commit in: src/main/java/org/gentoo/java/ebuilder/maven/, ...
Date: Wed, 30 Oct 2019 19:26:46
Message-Id: 1572463350.e71822f64bdddf72820cdbda93a3339946a2f9e3.fordfrog@gentoo
1 commit: e71822f64bdddf72820cdbda93a3339946a2f9e3
2 Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
3 AuthorDate: Wed Oct 30 19:22:19 2019 +0000
4 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
5 CommitDate: Wed Oct 30 19:22:30 2019 +0000
6 URL: https://gitweb.gentoo.org/proj/java-ebuilder.git/commit/?id=e71822f6
7
8 added header to the cache file
9
10 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
11
12 src/main/java/org/gentoo/java/ebuilder/maven/MavenCache.java | 2 +-
13 src/main/java/org/gentoo/java/ebuilder/portage/PortageParser.java | 3 ++-
14 2 files changed, 3 insertions(+), 2 deletions(-)
15
16 diff --git a/src/main/java/org/gentoo/java/ebuilder/maven/MavenCache.java b/src/main/java/org/gentoo/java/ebuilder/maven/MavenCache.java
17 index 9d91528..4772e61 100644
18 --- a/src/main/java/org/gentoo/java/ebuilder/maven/MavenCache.java
19 +++ b/src/main/java/org/gentoo/java/ebuilder/maven/MavenCache.java
20 @@ -112,7 +112,7 @@ public class MavenCache {
21 line = reader.readLine();
22
23 while (line != null) {
24 - if (!line.isEmpty()) {
25 + if (!line.isEmpty() && line.charAt(0) != '#') {
26 addCacheItem(new CacheItem(line));
27 }
28
29
30 diff --git a/src/main/java/org/gentoo/java/ebuilder/portage/PortageParser.java b/src/main/java/org/gentoo/java/ebuilder/portage/PortageParser.java
31 index 095e001..12422c2 100644
32 --- a/src/main/java/org/gentoo/java/ebuilder/portage/PortageParser.java
33 +++ b/src/main/java/org/gentoo/java/ebuilder/portage/PortageParser.java
34 @@ -386,7 +386,8 @@ public class PortageParser {
35 StandardOpenOption.TRUNCATE_EXISTING),
36 Charset.forName("UTF-8"))) {
37 writer.write(CACHE_VERSION);
38 - writer.write('\n');
39 + writer.write("\n#category:pkg:version:slot:useFlag:groupId:"
40 + + "artifactId:mavenVersion\n");
41
42 for (final CacheItem cacheItem : cacheItems) {
43 writer.write(cacheItem.getCategory());