Hi All,
I've got some trivial patches to commit for API documentation cleanups
and an addition to the spacewalk-repo-sync manpage.
As these are outside of my normal area of contribution (spacecmd), can I
get review/approval/permission that I can go ahead and commit these
please?
4 patches attached, can re-send inline if preferred.
Thanks,
Steve
>From 8a7606677b18cbe39000f0e5e3b691a09da0ecbe Mon Sep 17 00:00:00 2001
From: Steven Hardy <sha...@redhat.com>
Date: Tue, 6 Mar 2012 16:24:36 +0000
Subject: [PATCH 1/4] spacewalk-repo-sync documentation fix : add include/exclude options to manpage
Fix missing --include/--exclude options from spacewalk-repo-sync manpage, also
fix a minor typo.
---
backend/satellite_tools/spacewalk-repo-sync.sgml | 24 +++++++++++++++++++++-
1 files changed, 23 insertions(+), 1 deletions(-)
diff --git a/backend/satellite_tools/spacewalk-repo-sync.sgml b/backend/satellite_tools/spacewalk-repo-sync.sgml
index d7960cb..73379cd 100644
--- a/backend/satellite_tools/spacewalk-repo-sync.sgml
+++ b/backend/satellite_tools/spacewalk-repo-sync.sgml
@@ -43,6 +43,16 @@ Syncs the content from yum repos into Spacewalk or Satellite channels.
<arg>-f</arg>
<arg>--fail</arg>
</group>
+ <sbr>
+ <group>
+ <arg>-i <replaceable>PKG1,PKG2...</replaceable></arg>
+ <arg>--include <replaceable>PKG1,PKG2...</replaceable></arg>
+ </group>
+ <sbr>
+ <group>
+ <arg>-e <replaceable>PKG1,PKG2...</replaceable></arg>
+ <arg>--exclude <replaceable>PKG1,PKG2...</replaceable></arg>
+ </group>
</cmdsynopsis>
</synopsis>
</refsynopsisdiv>
@@ -78,7 +88,7 @@ Syncs the content from yum repos into Spacewalk or Satellite channels.
<varlistentry>
<term>-c<replaceable>CHANNEL</replaceable>, --channel=<replaceable>CHANNEL</replaceable></term>
<listitem>
- <para>The channel to sync the repository too.</para>
+ <para>The channel to sync the repository to.</para>
</listitem>
</varlistentry>
<varlistentry>
@@ -105,6 +115,18 @@ Syncs the content from yum repos into Spacewalk or Satellite channels.
<para>Do not print any output except for errors.</para>
</listitem>
</varlistentry>
+ <varlistentry>
+ <term>-i <replaceable>PKG1,PKG2...</replaceable>, --include <replaceable>PKG1,PKG2...</replaceable></term>
+ <listitem>
+ <para>Comma or space separated list of included packages.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>-e <replaceable>PKG1,PKG2...</replaceable>, --exclude <replaceable>PKG1,PKG2...</replaceable></term>
+ <listitem>
+ <para>Comma or space separated list of excluded packages.</para>
+ </listitem>
+ </varlistentry>
</variablelist>
</refsect1>
--
1.7.1
>From ade0e4fc83cdaf0d14e2752d0655044d714cc97e Mon Sep 17 00:00:00 2001
From: Steven Hardy <sha...@redhat.com>
Date: Thu, 2 Feb 2012 10:42:03 +0000
Subject: [PATCH 4/4] API : KickstartHandler::renameProfile remove unused code referring to Kickstart Trees
Remove commented code related to renaming Kickstart trees as this method renames the profile
---
.../xmlrpc/kickstart/KickstartHandler.java | 8 --------
1 files changed, 0 insertions(+), 8 deletions(-)
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/KickstartHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/KickstartHandler.java
index c03fb97..351019f 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/KickstartHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/KickstartHandler.java
@@ -479,14 +479,6 @@ public class KickstartHandler extends BaseHandler {
cmd.setLabel(newLabel);
cmd.store();
- /*if (op.getTree() == null) {
- throw new InvalidKickstartTreeException("api.kickstart.tree.notfound");
- }
- op.setLabel(newLabel);
- ValidatorError ve = op.store();
- if (ve != null) {
- throw new InvalidKickstartTreeException(ve.getKey());
- }*/
return 1;
}
--
1.7.1
>From 8d80df4402afdd1536dccac429831e7e5be1cd0a Mon Sep 17 00:00:00 2001
From: Steven Hardy <sha...@redhat.com>
Date: Thu, 2 Feb 2012 10:31:27 +0000
Subject: [PATCH 2/4] API Documentation : api.get_version fix typo
Fix typo in api.get_version usage, "Satellie" should be "Satellite"
---
.../redhat/rhn/frontend/xmlrpc/api/ApiHandler.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/api/ApiHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/api/ApiHandler.java
index ede355e..9313640 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/api/ApiHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/api/ApiHandler.java
@@ -57,7 +57,7 @@ public class ApiHandler extends BaseHandler {
* @return the api version.
*
* @xmlrpc.doc Returns the version of the API. Since Spacewalk 0.4
- * (Satellie 5.3) it is no more related to server version.
+ * (Satellite 5.3) it is no more related to server version.
* @xmlrpc.returntype string
*/
public String getVersion() {
--
1.7.1
>From 51af5566175b83d8a9b71887813e22214d82d0aa Mon Sep 17 00:00:00 2001
From: Steven Hardy <sha...@redhat.com>
Date: Thu, 2 Feb 2012 10:39:47 +0000
Subject: [PATCH 3/4] API Documentation : kickstart.renameProfile renames profiles not kickstart trees
Fix erroneous references re renaming distributions/kickstart trees when this
call really renames kickstart profiles
---
.../xmlrpc/kickstart/KickstartHandler.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/KickstartHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/KickstartHandler.java
index ce133bb..c03fb97 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/KickstartHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/KickstartHandler.java
@@ -451,15 +451,15 @@ public class KickstartHandler extends BaseHandler {
* Rename a kickstart profile.
*
* @param sessionKey User's session key.
- * @param originalLabel Label for tree we want to edit
- * @param newLabel to assign to tree.
+ * @param originalLabel Label for profile we want to edit
+ * @param newLabel to assign to profile
* @return 1 if successful, exception otherwise.
*
- * @xmlrpc.doc Rename a Kickstart Tree (Distribution) in Satellite
+ * @xmlrpc.doc Rename a Kickstart Profile in Satellite
* @xmlrpc.param #session_key()
* @xmlrpc.param #param_desc("string", "originalLabel" "Label for the
- * kickstart tree you want to rename")
- * @xmlrpc.param #param_desc("string", "newLabel" "new label to change too")
+ * kickstart profile you want to rename")
+ * @xmlrpc.param #param_desc("string", "newLabel" "new label to change to")
* @xmlrpc.returntype #return_int_success()
*/
public int renameProfile(String sessionKey, String originalLabel, String newLabel) {
--
1.7.1
_______________________________________________
Spacewalk-devel mailing list
Spacewalk-devel@redhat.com
https://www.redhat.com/mailman/listinfo/spacewalk-devel
