client/tools/spacewalk-remote-utils/spacewalk-create-channel/doc/README | 4 +- client/tools/spacewalk-remote-utils/spacewalk-create-channel/doc/spacewalk-create-channel.sgml | 2 - client/tools/spacewalk-remote-utils/spacewalk-create-channel/spacewalk-create-channel | 5 ++- client/tools/spacewalk-remote-utils/spacewalk-remote-utils.spec | 14 +++++++--- rel-eng/packages/spacewalk-remote-utils | 2 - 5 files changed, 17 insertions(+), 10 deletions(-)
New commits: commit 94c215130819aa412390f55d640ce62ee6ecdd4d Author: Justin Sherrill jsherril@redhat.com Date: Tue Oct 5 16:49:17 2010 -0400
Automatic commit of package [spacewalk-remote-utils] release [1.0.4-1].
diff --git a/client/tools/spacewalk-remote-utils/spacewalk-remote-utils.spec b/client/tools/spacewalk-remote-utils/spacewalk-remote-utils.spec index 485f782..53cf0d8 100644 --- a/client/tools/spacewalk-remote-utils/spacewalk-remote-utils.spec +++ b/client/tools/spacewalk-remote-utils/spacewalk-remote-utils.spec @@ -4,7 +4,7 @@ %endif
Name: spacewalk-remote-utils -Version: 1.0.3 +Version: 1.0.4 Release: 1%{?dist} Summary: Utilities to interact with a Satellite or Spacewalk server remotely.
@@ -52,6 +52,12 @@ docbook2man ./spacewalk-create-channel/doc/spacewalk-create-channel.sgml -o ./sp %doc %{_mandir}/man1/spacecwalk-create-channel.1.gz
%changelog +* Tue Oct 05 2010 Justin Sherrill jsherril@redhat.com 1.0.4-1 +- adding RHEL 6 data files for spacewalk-create-channel (jsherril@redhat.com) +- adding initial support for RHEL 6 to spacewalk-create-channel + (jsherril@redhat.com) +- updating readme for spacewalk-create-channel (jsherril@redhat.com) + * Thu Sep 30 2010 Justin Sherrill jsherril@redhat.com 1.0.3-1 - updating spacewalk-remote-utils man page to remove left over bits from copied spec (jsherril@redhat.com) diff --git a/rel-eng/packages/spacewalk-remote-utils b/rel-eng/packages/spacewalk-remote-utils index 904be1a..a544919 100644 --- a/rel-eng/packages/spacewalk-remote-utils +++ b/rel-eng/packages/spacewalk-remote-utils @@ -1 +1 @@ -1.0.3-1 client/tools/spacewalk-remote-utils/ +1.0.4-1 client/tools/spacewalk-remote-utils/
commit ad844ae5fad8ec0198985dde21781086686cd83b Author: Justin Sherrill jsherril@redhat.com Date: Tue Oct 5 16:38:57 2010 -0400
fixing another path issue with data files for spacewalk-create-channel
diff --git a/client/tools/spacewalk-remote-utils/spacewalk-create-channel/spacewalk-create-channel b/client/tools/spacewalk-remote-utils/spacewalk-create-channel/spacewalk-create-channel index 3e1d191..8227f00 100755 --- a/client/tools/spacewalk-remote-utils/spacewalk-create-channel/spacewalk-create-channel +++ b/client/tools/spacewalk-remote-utils/spacewalk-create-channel/spacewalk-create-channel @@ -19,7 +19,7 @@ from optparse import OptionParser
DATA_DIR = "./data/" -DATA_DIR_RHN = "/etc/sysconfig/rhn/channel-data/" +DATA_DIR_RHN = "/usr/share/rhn/channel-data/" GATHER_DIR = "/mnt/engarchive2/released/"
versions = ( "6", "5", "4", "3", "2.1" );
commit d159e5cae5a3c602c480277683afca7fdfc4f227 Author: Justin Sherrill jsherril@redhat.com Date: Tue Oct 5 16:37:25 2010 -0400
fixing path issue with data files for spacewalk-create-channel
diff --git a/client/tools/spacewalk-remote-utils/spacewalk-create-channel/spacewalk-create-channel b/client/tools/spacewalk-remote-utils/spacewalk-create-channel/spacewalk-create-channel index f201fdb..3e1d191 100755 --- a/client/tools/spacewalk-remote-utils/spacewalk-create-channel/spacewalk-create-channel +++ b/client/tools/spacewalk-remote-utils/spacewalk-create-channel/spacewalk-create-channel @@ -133,7 +133,7 @@ def main(): arch = options.arch extra = options.extra filename = getFileName(version,update, release, arch, extra) - fullpath = DATA_DIR + filename + fullpath = DATA_DIR_RHN + filename else: filename = os.path.basename(options.data) fullpath = options.data @@ -223,7 +223,7 @@ def populate(client, auth, srcChannel, newChannel, newChannelName, filename, par clearChannel(newChannel, existing_packs, client, auth)
#strip new lines - fileList = map(str.strip, open(DATA_DIR + filename).readlines()) + fileList = map(str.strip, open(DATA_DIR_RHN + filename).readlines()) fileList.sort() pack_num = 0 skip_num = 0 diff --git a/client/tools/spacewalk-remote-utils/spacewalk-remote-utils.spec b/client/tools/spacewalk-remote-utils/spacewalk-remote-utils.spec index 594b1c8..485f782 100644 --- a/client/tools/spacewalk-remote-utils/spacewalk-remote-utils.spec +++ b/client/tools/spacewalk-remote-utils/spacewalk-remote-utils.spec @@ -33,8 +33,8 @@ docbook2man ./spacewalk-create-channel/doc/spacewalk-create-channel.sgml -o ./sp %{__mkdir_p} %{buildroot}/%{_bindir} %{__install} -p -m0755 spacewalk-create-channel/spacewalk-create-channel %{buildroot}/%{_bindir}/
-%{__mkdir_p} %{buildroot}/%{_datadir}/channel-data -%{__install} -p -m0644 spacewalk-create-channel/data/* %{buildroot}/%{_datadir}/channel-data/ +%{__mkdir_p} %{buildroot}/%{_datadir}/rhn/channel-data +%{__install} -p -m0644 spacewalk-create-channel/data/* %{buildroot}/%{_datadir}/rhn/channel-data/
%{__mkdir_p} %{buildroot}/%{_mandir}/man1 %{__gzip} -c ./spacewalk-create-channel/doc/spacewalk-create-channel.1 > %{buildroot}/%{_mandir}/man1/spacecwalk-create-channel.1.gz @@ -46,7 +46,7 @@ docbook2man ./spacewalk-create-channel/doc/spacewalk-create-channel.sgml -o ./sp %defattr(-,root,root,-) %{_bindir}/spacewalk-create-channel #%{python_sitelib}/spacecmd/ -%{_datadir}/channel-data/ +%{_datadir}/rhn/channel-data/
%doc spacewalk-create-channel/doc/README spacewalk-create-channel/doc/COPYING %doc %{_mandir}/man1/spacecwalk-create-channel.1.gz
commit 7b62c093697ccbafa0f4cf138fe6a9f316b21913 Author: Justin Sherrill jsherril@redhat.com Date: Tue Oct 5 16:32:13 2010 -0400
a few fixes for spaceawlk-channel-create
diff --git a/client/tools/spacewalk-remote-utils/spacewalk-create-channel/doc/README b/client/tools/spacewalk-remote-utils/spacewalk-create-channel/doc/README index 42dcfa7..72c2dd7 100644 --- a/client/tools/spacewalk-remote-utils/spacewalk-create-channel/doc/README +++ b/client/tools/spacewalk-remote-utils/spacewalk-create-channel/doc/README @@ -36,8 +36,8 @@ then simply pass the '--skiplist=skiplist.txt' option when running the command. be copied to the channel except for those in the skip list.
-In addition to the script, you should find in this directory: -data/ - Data files for all of the update releases. +In addition to the script, you should find in this package: +/etc/sysconfig/rhn/channel-data/ - Data files for all of the update releases. README - This file
diff --git a/client/tools/spacewalk-remote-utils/spacewalk-create-channel/doc/spacewalk-create-channel.sgml b/client/tools/spacewalk-remote-utils/spacewalk-create-channel/doc/spacewalk-create-channel.sgml index 2d0ff65..0700549 100644 --- a/client/tools/spacewalk-remote-utils/spacewalk-create-channel/doc/spacewalk-create-channel.sgml +++ b/client/tools/spacewalk-remote-utils/spacewalk-create-channel/doc/spacewalk-create-channel.sgml @@ -211,7 +211,7 @@ the Spacewalk or Satellite server. <member>Creating a channel 'my-stable-channel' for RHEL 4 AS u3 i386: <command>create-channel-update --user=admin --server=myserver.example.com --version=4 --update=u3 --release=AS --arch=i386 --destChannel=my-stable-channel</command> <command>create-channel-update -l admin -s myserver.example.com -D /usr/share/rhn/channel-data/4-U3-AS-i386 -d my-stable-channel</command></member> - <member>Upgrade prevously created channel 'my-stable-channel' to RHEL 4 AS u4 i386: + <member>Upgrade previously created channel 'my-stable-channel' to RHEL 4 AS u4 i386: <command>create-channel-update -l admin -s myserver.example.com -v 4 -u u4 -r AS -a i386 -d my-stable-channel</command></member> <member>Add the extra's channel as a child channel of 'my-stable-channel': <command>create-channel-update -l admin -s myserver.example.com -v 4 -u u4 -r AS -a i386 -e extras -p my-stable-channel -d my-stable-extras</command></member> diff --git a/client/tools/spacewalk-remote-utils/spacewalk-create-channel/spacewalk-create-channel b/client/tools/spacewalk-remote-utils/spacewalk-create-channel/spacewalk-create-channel index 523476d..f201fdb 100755 --- a/client/tools/spacewalk-remote-utils/spacewalk-create-channel/spacewalk-create-channel +++ b/client/tools/spacewalk-remote-utils/spacewalk-create-channel/spacewalk-create-channel @@ -19,6 +19,7 @@ from optparse import OptionParser
DATA_DIR = "./data/" +DATA_DIR_RHN = "/etc/sysconfig/rhn/channel-data/" GATHER_DIR = "/mnt/engarchive2/released/"
versions = ( "6", "5", "4", "3", "2.1" );
spacewalk-commits@lists.fedorahosted.org