Skip to content

Commit c915fd6

Browse files
authored
Merge pull request #436 from schwingmar/fix-320-rpm-symlink-owner
Add user and group to symlinks in rpm
2 parents 12ae9c3 + 08db51c commit c915fd6

3 files changed

Lines changed: 16 additions & 2 deletions

File tree

src/main/groovy/com/netflix/gradle/plugins/packaging/Link.groovy

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,6 @@ class Link implements Serializable {
2323
String path
2424
String target
2525
int permissions = -1
26+
String user = null
27+
String permissionGroup = null
2628
}

src/main/groovy/com/netflix/gradle/plugins/packaging/SystemPackagingExtension.groovy

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -777,14 +777,24 @@ class SystemPackagingExtension {
777777

778778

779779
Link link(String path, String target) {
780-
link(path, target, -1)
780+
link(path, target, -1, null, null)
781781
}
782782

783783
Link link(String path, String target, int permissions) {
784+
link(path, target, permissions, null, null)
785+
}
786+
787+
Link link(String path, String target, String user, String permissionGroup) {
788+
link(path, target, -1, user, permissionGroup)
789+
}
790+
791+
Link link(String path, String target, int permissions, String user, String permissionGroup) {
784792
Link link = new Link()
785793
link.path = path
786794
link.target = target
787795
link.permissions = permissions
796+
link.user = user
797+
link.permissionGroup = permissionGroup
788798
links.add(link)
789799
link
790800
}

src/main/groovy/com/netflix/gradle/plugins/rpm/RpmCopyAction.groovy

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,9 @@ class RpmCopyAction extends AbstractPackagingCopyAction<Rpm> {
196196

197197
@Override
198198
protected void addLink(Link link) {
199-
builder.addLink link.path, link.target, link.permissions
199+
def user = link.user ?: task.user
200+
def permissionGroup = link.permissionGroup ?: task.permissionGroup
201+
builder.addLink(link.path, link.target, link.permissions, user, permissionGroup)
200202
}
201203

202204
@Override

0 commit comments

Comments
 (0)