backend/satellite_tools/disk_dumper/rhn-satellite-exporter | 5 ++
backend/satellite_tools/disk_dumper/rhn-satellite-exporter.sgml | 17 +++++++---
backend/spacewalk-backend.spec | 5 ++
rel-eng/packages/spacewalk-backend | 2 -
4 files changed, 22 insertions(+), 7 deletions(-)
New commits:
commit 738e68551142fd65b32f730e83763921691535dc
Author: Stephen Herr <sherr(a)redhat.com>
Date: Tue Jun 26 15:38:21 2012 -0400
Automatic commit of package [spacewalk-backend] release [1.8.42-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 8aec5c0..11164cb 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -12,7 +12,7 @@ Name: spacewalk-backend
Summary: Common programs needed to be installed on the Spacewalk servers/proxies
Group: Applications/Internet
License: GPLv2
-Version: 1.8.41
+Version: 1.8.42
Release: 1%{?dist}
URL:
https://fedorahosted.org/spacewalk
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -646,6 +646,9 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Tue Jun 26 2012 Stephen Herr <sherr(a)redhat.com> 1.8.42-1
+- 835676 - man page fix and root-level user warning for rhn-satellite-exporter
+
* Tue Jun 26 2012 Michael Mraka <michael.mraka(a)redhat.com> 1.8.41-1
- 833686 - don't open file if path is None
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index 780e499..109a904 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.8.41-1 backend/
+1.8.42-1 backend/
commit 2509c5abfcb3288f604e757e34eb582a3e568bd1
Author: Stephen Herr <sherr(a)redhat.com>
Date: Tue Jun 26 15:37:26 2012 -0400
835676 - man page fix and root-level user warning for rhn-satellite-exporter
diff --git a/backend/satellite_tools/disk_dumper/rhn-satellite-exporter
b/backend/satellite_tools/disk_dumper/rhn-satellite-exporter
index cfca912..2acaa88 100755
--- a/backend/satellite_tools/disk_dumper/rhn-satellite-exporter
+++ b/backend/satellite_tools/disk_dumper/rhn-satellite-exporter
@@ -17,11 +17,16 @@
import cStringIO
import sys
+import os
from spacewalk.satellite_tools.disk_dumper import iss
from spacewalk.satellite_tools.syncLib import log2stderr, log2email
from spacewalk.common.rhnTB import Traceback
+if os.geteuid() != 0:
+ print "This script must be run as root."
+ exit()
+
if __name__ == "__main__":
try:
main = iss.ExporterMain()
diff --git a/backend/satellite_tools/disk_dumper/rhn-satellite-exporter.sgml
b/backend/satellite_tools/disk_dumper/rhn-satellite-exporter.sgml
index 0f7c9c7..a83bc1f 100644
--- a/backend/satellite_tools/disk_dumper/rhn-satellite-exporter.sgml
+++ b/backend/satellite_tools/disk_dumper/rhn-satellite-exporter.sgml
@@ -22,7 +22,10 @@ A tool that exports satellite content into a directory in an XML
format. That co
<cmdsynopsis>
<command>rhn-satellite-exporter</command>
<arg>options <replaceable>...</replaceable></arg>
- <arg>-v</arg> <arg>--verbose</arg>
+ </cmdsynopsis>
+ <cmdsynopsis>
+ <arg>-v</arg>
+ <arg>--verbose</arg>
</cmdsynopsis>
<cmdsynopsis>
<arg>-d<replaceable>DIRECTORY</replaceable></arg>
@@ -116,6 +119,12 @@ A tool that exports satellite content into a directory in an XML
format. That co
<RefSect1><Title>Options</Title>
<variablelist>
<varlistentry>
+ <term>-v, --verbose</term>
+ <listitem>
+ <para>Set debug level to 3. Overrides the value in
rhn.conf.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
<term>-dDIR, --dir=DIR</term>
<listitem>
<para>Place the exported information into this directory.</para>
@@ -128,8 +137,7 @@ A tool that exports satellite content into a directory in an XML
format. That co
</listitem>
</varlistentry>
<varlistentry>
- <term>-c<replaceable>CHANNEL_LABEL</replaceable>,
- --channel=<replaceable>CHANNEL_LABEL</replaceable></term>
+ <term>-c<replaceable>CHANNEL_LABEL</replaceable>,
--channel=<replaceable>CHANNEL_LABEL</replaceable></term>
<listitem>
<para>Process data for this specific channel (specified by label)
only.
@@ -138,8 +146,7 @@ A tool that exports satellite content into a directory in an XML
format. That co
</listitem>
</varlistentry>
<varlistentry>
- <term>-a,
- --all-channels</term>
+ <term>-a, --all-channels</term>
<listitem>
<para>Export all channels.</para>
</listitem>