java/code/src/com/redhat/rhn/domain/kickstart/KickstartableTree.java |
12 +++++-----
java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerDistroCreateCommand.java |
2 -
java/code/src/org/cobbler/Distro.java |
4 +--
3 files changed, 9 insertions(+), 9 deletions(-)
New commits:
commit 5cdbcd7e688984a74ed874e9345dd1252bb638f0
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Apr 20 17:16:13 2011 +0200
checkstyle fixes.
diff --git a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartableTree.java
b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartableTree.java
index 510609f..0bdf3e2 100644
--- a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartableTree.java
+++ b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartableTree.java
@@ -277,9 +277,9 @@ public class KickstartableTree extends BaseDomainHelper {
else if (arch.equals("channel-ppc")) {
return StringUtil.addPath(getAbsolutePath(),
"/ppc/ppc64/vmlinuz");
}
- else if ( this.installType.isSUSE() )
- {
- return StringUtil.addPath(getAbsolutePath(), "/boot/" +
this.getChannel().getChannelArch().getName() + "/loader/linux");
+ else if (this.installType.isSUSE()) {
+ return StringUtil.addPath(getAbsolutePath(), "/boot/" +
+ this.getChannel().getChannelArch().getName() +
"/loader/linux");
}
else {
return StringUtil.addPath(getAbsolutePath(),
"/images/pxeboot/vmlinuz");
@@ -300,9 +300,9 @@ public class KickstartableTree extends BaseDomainHelper {
else if (arch.equals("channel-ppc")) {
return StringUtil.addPath(getAbsolutePath(),
"/ppc/ppc64/ramdisk.image.gz");
}
- else if ( this.installType.isSUSE() )
- {
- return StringUtil.addPath(getAbsolutePath(), "/boot/" +
this.getChannel().getChannelArch().getName() + "/loader/initrd");
+ else if (this.installType.isSUSE()) {
+ return StringUtil.addPath(getAbsolutePath(), "/boot/" +
+ this.getChannel().getChannelArch().getName() +
"/loader/initrd");
}
else {
return StringUtil.addPath(getAbsolutePath(),
"/images/pxeboot/initrd.img");
diff --git
a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerDistroCreateCommand.java
b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerDistroCreateCommand.java
index f7e405d..c580ce2 100644
---
a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerDistroCreateCommand.java
+++
b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerDistroCreateCommand.java
@@ -83,7 +83,7 @@ public class CobblerDistroCreateCommand extends CobblerDistroCommand {
ksmeta.put("org", tree.getOrgId().toString());
}
- if( tree.getInstallType().isSUSE() ) {
+ if (tree.getInstallType().isSUSE()) {
ksmeta.put("autoyast", "true");
}
diff --git a/java/code/src/org/cobbler/Distro.java
b/java/code/src/org/cobbler/Distro.java
index f12ced8..4327cc1 100644
--- a/java/code/src/org/cobbler/Distro.java
+++ b/java/code/src/org/cobbler/Distro.java
@@ -53,8 +53,8 @@ public class Distro extends CobblerObject {
distro.modify(NAME, name);
distro.setKernel(kernel);
distro.setInitrd(initrd);
- if( ksmeta.containsKey( "autoyast" ) ) {
- distro.setBreed( "suse" );
+ if (ksmeta.containsKey("autoyast")) {
+ distro.setBreed("suse");
}
distro.setKsMeta(ksmeta);
distro.save();
Show replies by date