backend/satellite_tools/reposync.py | 6 - backend/satellite_tools/spacewalk-repo-sync.sgml | 120 +++++++++++++++++++++++ backend/spacewalk-backend.spec | 9 + rel-eng/packages/spacewalk-backend | 2 4 files changed, 129 insertions(+), 8 deletions(-)
New commits: commit 377fd5984b5828bd6d69262dec3089d4099744c7 Author: Justin Sherrill jsherril@redhat.com Date: Fri Sep 10 18:21:10 2010 -0400
Automatic commit of package [spacewalk-backend] release [1.2.12-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec index a71c85e..a818899 100644 --- a/backend/spacewalk-backend.spec +++ b/backend/spacewalk-backend.spec @@ -10,7 +10,7 @@ Name: spacewalk-backend Summary: Common programs needed to be installed on the Spacewalk servers/proxies Group: Applications/Internet License: GPLv2 and Python -Version: 1.2.11 +Version: 1.2.12 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%%7Bname%7D-%%7Bversion%7D.t... @@ -687,6 +687,12 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$ %changelog +* Fri Sep 10 2010 Justin Sherrill jsherril@redhat.com 1.2.12-1 +- 626764 - adding man page for spacewalk-repo-sync (jsherril@redhat.com) +- style fixes (jsherril@redhat.com) +- 571355 - fixing issue where packages that were physically deleted are not re- + downloaded during a reposync (jsherril@redhat.com) + * Wed Sep 08 2010 Miroslav Suchý msuchy@redhat.com 1.2.11-1 - 555046 - when installtime change, update package in db - create string representation of object dbPackage for better debugging diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend index 6e5c030..9d86315 100644 --- a/rel-eng/packages/spacewalk-backend +++ b/rel-eng/packages/spacewalk-backend @@ -1 +1 @@ -1.2.11-1 backend/ +1.2.12-1 backend/
commit f811b19e95ad3ac170c782ad4be79abe69440d50 Author: Justin Sherrill jsherril@redhat.com Date: Fri Sep 10 18:19:06 2010 -0400
updating spec for repo-sync man page
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec index c7faf1d..a71c85e 100644 --- a/backend/spacewalk-backend.spec +++ b/backend/spacewalk-backend.spec @@ -663,6 +663,7 @@ rm -f %{rhnconf}/rhnSecret.py* %{_mandir}/man8/satpasswd.8* %{_mandir}/man8/satwho.8* %{_mandir}/man8/spacewalk-remove-channel.8* +%{_mandir}/man8/spacewalk-repo-sync.8*
%files xml-export-libs %defattr(-,root,root)
commit b94dcc24bbd0cc400ae8c3602a86ca86ec1aea7c Author: Justin Sherrill jsherril@redhat.com Date: Fri Sep 10 18:00:08 2010 -0400
626764 - adding man page for spacewalk-repo-sync
diff --git a/backend/satellite_tools/reposync.py b/backend/satellite_tools/reposync.py index b8a49f1..df24f12 100644 --- a/backend/satellite_tools/reposync.py +++ b/backend/satellite_tools/reposync.py @@ -80,10 +80,6 @@ class RepoSync: if not options.channel_label: quit = True self.error_msg("--channel must be specified") - if options.label: - self.error_msg("--label is obsoleted") - if options.mirror: - self.error_msg("--mirrorlist is obsoleted; mirrorlist is recognized automatically")
self.log_msg("\nSync started: %s" % (time.asctime(time.localtime()))) self.log_msg(str(sys.argv)) @@ -116,10 +112,8 @@ class RepoSync: self.parser.add_option('-u', '--url', action='store', dest='url', help='The url to sync') self.parser.add_option('-c', '--channel', action='store', dest='channel_label', help='The label of the channel to sync packages to') self.parser.add_option('-t', '--type', action='store', dest='type', help='The type of repo, currently only "yum" is supported', default='yum') - self.parser.add_option('-l', '--label', action='store_true', dest='label', help='Ignored; for compatibility with old versions') self.parser.add_option('-f', '--fail', action='store_true', dest='fail', default=False , help="If a package import fails, fail the entire operation") self.parser.add_option('-q', '--quiet', action='store_true', dest='quiet', default=False, help="Print no output, still logs output") - self.parser.add_option('-m', '--mirrorlist', action='store_true', dest='mirror', default=False, help="Ignored; for compatibility with old versions. Mirrorlist is recognized automatically.") return self.parser.parse_args()
def load_plugin(self): diff --git a/backend/satellite_tools/spacewalk-repo-sync.sgml b/backend/satellite_tools/spacewalk-repo-sync.sgml new file mode 100644 index 0000000..88e3aad --- /dev/null +++ b/backend/satellite_tools/spacewalk-repo-sync.sgml @@ -0,0 +1,120 @@ +<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V3.1//EN" [ +<!ENTITY RHNSAT "RHN Satellite Server" > +<!ENTITY RHNCHANRM "Spacewalk repository syncing tool" > + +]> +<refentry> + +<RefMeta> +<RefEntryTitle>spacewalk-repo-sync</RefEntryTitle><manvolnum>8</manvolnum> +<RefMiscInfo>Version 3.5.0</RefMiscInfo> +</RefMeta> + +<RefNameDiv> +<RefName><command>spacewalk-repo-sync</command></RefName> +<RefPurpose> +Syncs the content from yum repos into Spacewalk or Satellite channels. +</RefPurpose> +</RefNameDiv> + +<RefSynopsisDiv> +<Synopsis> + <cmdsynopsis> + <command>spaceawlk-remove-channel</command> + <arg>options <replaceable>...</replaceable></arg> + <arg>-c<replaceable>CHANNEL_LABEL</replaceable></arg> + <arg>--channel=<replaceable>CHANNEL_LABEL</replaceable></arg> + </cmdsynopsis> + <cmdsynopsis> + <arg>-u<replaceable>URL</replaceable></arg> + <arg>--url=<replaceable>URL</replaceable></arg> + </cmdsynopsis> + <cmdsynopsis> + <arg>-q</arg> + <arg>--quiet</arg> + </cmdsynopsis> + <cmdsynopsis> + <arg>-f</arg> + <arg>--fail</arg> + </cmdsynopsis> + <cmdsynopsis> + <arg>-t<replaceable>TYPE</replaceable></arg> + <arg>--type=<replaceable>TYPE</replaceable></arg> + </cmdsynopsis> +</Synopsis> +</RefSynopsisDiv> + +<RefSect1><Title>Description</Title> +<para> + The <emphasis>spacewalk-repo-sync</emphasis> tool is used to sync packages from + external or local yum repositories. All the packages within the specified repository + will be added to the channel. +</para> + +<para> + Any url supported by yum is supported by this utility, including mirror lists. + If the url is not supplied, the tool will look to see what repositories are associated + with the specified channel and use those. +</para> +</RefSect1> + +<RefSect1><Title>Options</Title> +<variablelist> + <varlistentry> + <term>-h, --help</term> + <listitem> + <para>Display the help screen with a list of options.</para> + </listitem> + </varlistentry> + <varlistentry> + <term>-c<replaceable>CHANNEL</replaceable>, --channel=<replaceable>CHANNEL</replaceable></term> + <listitem> + <para>The channel to sync the repository too.</para> + </listitem> + </varlistentry> + <varlistentry> + <term>-u<replaceable>URL</replaceable>, --url=<replaceable>URL</replaceable></term> + <listitem> + <para>The repository URL. Any protocol supported by yum is supported including http://, nfs://, file://. (Optional)</para> + </listitem> + </varlistentry> + <varlistentry> + <term>-t<replaceable>TYPE</replaceable>, --type=<replaceable>TYPE</replaceable></term> + <listitem> + <para>The type of repository to sync. Currently only yum is supported and is the default. (Optional)</para> + </listitem> + </varlistentry> + <varlistentry> + <term>-f, --fail</term> + <listitem> + <para>By default if an error occurs with a single package, the rest of the sync continues. When using this option, the entire sync will terminate upon any error.</para> + </listitem> + </varlistentry> + <varlistentry> + <term>-q, --quiet</term> + <listitem> + <para>Do not print any output except for errors.</para> + </listitem> + </varlistentry> +</variablelist> +</RefSect1> + +<RefSect1><Title>Examples</Title> +<simplelist> + <member><command>spacewalk-repo-sync --channel=my-custom-channel</command></member> + <member><command>spacewalk-remove-channel --channel=my-custom-channel --url=http://example.com/yum-repo/</command></member> + <member><command>spacewalk-remove-channel --channel=my-custom-channel --url=file:///var/share/localrepo/</command></member> + <member><command>spacewalk-remove-channel --channel=my-custom-channel --url=http://example.com/mirrorlist.xml/</command></member> +</simplelist> +</RefSect1> + +<RefSect1><Title>Authors</Title> +<simplelist> + <member>Justin Sherrill <email>jsherril@redhat.com</email></member> +</simplelist> +</RefSect1> +</RefEntry> + +<!-- +vim: sw=4 +-->
spacewalk-commits@lists.fedorahosted.org