Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

Expand builtins #2

Merged
merged 2 commits into from

2 participants

David Resnick Craig W. Blake
David Resnick

Hi Craig,

I'd appreciate it if you could merge this and make a release. Please let me know if there is anything you'd like changed.

Thanks,
David

Craig W. Blake craigwblake merged commit 728d6e9 into from
David Resnick

Hi Craig,

Do you have any expectations about when you are going to upload a new release to Maven central?

  • David
Craig W. Blake
Owner
Craig W. Blake
Owner
David Resnick

Hi Craig,

I was expecting 1.1.9 to be available almost immediately, but it still doesn't seem to be there. I'm looking at http://repo1.maven.org/maven2/org/redline-rpm/redline/

Should I be looking someplace else?

Thanks,
David

Craig W. Blake
Owner
Craig W. Blake
Owner
David Resnick

Thanks a lot, it is now available!

-David

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
This page is out of date. Refresh to see the latest.
12 source/main/org/freecompany/redline/payload/Contents.java
View
@@ -46,6 +46,7 @@
builtin.add( "/bin");
builtin.add( "/dev");
builtin.add( "/etc");
+ builtin.add( "/etc/bash_completion.d");
builtin.add( "/etc/cron.d");
builtin.add( "/etc/cron.daily");
builtin.add( "/etc/cron.hourly");
@@ -64,6 +65,7 @@
builtin.add( "/usr/sbin");
builtin.add( "/usr/share");
builtin.add( "/usr/share/applications");
+ builtin.add( "/root");
builtin.add( "/sbin");
builtin.add( "/opt");
builtin.add( "/tmp");
@@ -308,6 +310,16 @@ protected synchronized void addParents( final File file, final int permissions,
}
/**
+ * Add additional directory that is assumed to already exist on system where the RPM will be installed
+ * (e.g. /etc) and should not have an entry in the RPM.
+ *
+ * @param directory
+ */
+ public synchronized static void addBuiltinDirectory( final String directory) {
+ builtin.add(directory);
+ }
+
+ /**
* Retrieve the size of this archive in number of files. This count includes both directory entries and
* soft links.
*/
11 source/test/org/freecompany/redline/payload/ContentsTest.java
View
@@ -25,4 +25,15 @@ public void testListParentsBuiltin() throws Exception {
assertEquals( "/bin/one/two", list.get( 1));
assertEquals( "/bin/one", list.get( 2));
}
+
+ public void testListParentsNewBuiltin() throws Exception {
+ ArrayList< String> list = new ArrayList< String>();
+ Contents.addBuiltinDirectory("/home");
+ Contents.listParents( list, new File( "/home/one/two/three/four"));
+
+ assertEquals( 3, list.size());
+ assertEquals( "/home/one/two/three", list.get( 0));
+ assertEquals( "/home/one/two", list.get( 1));
+ assertEquals( "/home/one", list.get( 2));
+ }
}
Something went wrong with that request. Please try again.