backend/satellite_tools/satellite-sync.sgml | 11 ++
backend/satellite_tools/satsync.py | 106 +++++++++++++---------------
rel-eng/build-missing-builds-in-koji.sh | 4 -
rel-eng/tito.props | 6 -
4 files changed, 65 insertions(+), 62 deletions(-)
New commits:
commit 5fd76c808e8f2e6e437afa88b9b2129289d0bf31
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon Jun 28 13:58:51 2010 +0200
dropping Fedora 11
[13:55] <adelton> msuchy: Milan, our 1.1 release nanny says he does not want to
do 1.1 on F11. We'd need it removed.
diff --git a/rel-eng/build-missing-builds-in-koji.sh
b/rel-eng/build-missing-builds-in-koji.sh
index 443020a..bcd23b4 100755
--- a/rel-eng/build-missing-builds-in-koji.sh
+++ b/rel-eng/build-missing-builds-in-koji.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-TAGS=([0]="dist-5E-sw-1.1-candidate" [1]="dist-f11-sw-1.1-candidate"
[2]="dist-f12-sw-1.1-candidate" [3]="dist-f13-sw-1.1-candidate")
+TAGS=([0]="dist-5E-sw-1.1-candidate" [1]="dist-f12-sw-1.1-candidate"
[2]="dist-f13-sw-1.1-candidate")
pushd `pwd`
@@ -9,7 +9,7 @@ cd `dirname $0`/..
# say python to be nice to pipe
export PYTHONUNBUFFERED=1
-for tag in 0 1 2 3; do
+for tag in 0 1 2; do
rel-eng/koji-missing-builds.py --no-extra ${TAGS[$tag]} | \
awk '!(/buildsys-macros/ || /oracle-server-admin/ || /oracle-server-scripts/ ||
/heirloom-pkgtools/) {
if (x==1) { print gensub(" *([a-zA-Z_-]+)-.*",
"\\1", "g")}
diff --git a/rel-eng/tito.props b/rel-eng/tito.props
index 9236bdd..d9b5da9 100644
--- a/rel-eng/tito.props
+++ b/rel-eng/tito.props
@@ -3,11 +3,7 @@ default_builder = spacewalk.releng.builder.Builder
default_tagger = spacewalk.releng.tagger.VersionTagger
[koji]
-autobuild_tags = dist-f11-sw-1.1-candidate dist-5E-sw-1.1-candidate
dist-f12-sw-1.1-candidate dist-f13-sw-1.1-candidate
-
-[dist-f11-sw-1.1-candidate]
-disttag = .fc11
-blacklist=jabberd-selinux
+autobuild_tags = dist-5E-sw-1.1-candidate dist-f12-sw-1.1-candidate
dist-f13-sw-1.1-candidate
[dist-5E-sw-1.1-candidate]
disttag = .el5
commit eb3be31dc6d547f891c246671cff1d7055d9c2d9
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon Jun 28 12:05:25 2010 +0200
608657 - if --consider-full is set, interpret disk dump as full export, otherwise it
is used as incremental dump
diff --git a/backend/satellite_tools/satsync.py b/backend/satellite_tools/satsync.py
index b2f12ae..8522a3b 100644
--- a/backend/satellite_tools/satsync.py
+++ b/backend/satellite_tools/satsync.py
@@ -1784,10 +1784,10 @@ Please contact your RHN representative""" %
(generation, sat_cert.generation))
# check to make sure the orgs exported are valid
_validate_package_org(uq_pkg_data)
try:
- if OPTIONS.mount_point:
- importer = sync_handlers.link_channel_packages(uq_pkg_data, strict=0)
+ if OPTIONS.mount_point: # if OPTIONS.consider_full is not set interpret dump
as incremental
+ importer = sync_handlers.link_channel_packages(uq_pkg_data,
strict=OPTIONS.consider_full)
else:
- importer = sync_handlers.link_channel_packages(uq_pkg_data)
+ importer = sync_handlers.link_channel_packages(uq_pkg_data)
except (SQLError, SQLSchemaError, SQLConnectError), e:
tbOut = cStringIO.StringIO()
Traceback(mail=0, ostream=tbOut, with_locals=1)
commit 357f4f02969c20ca16039fb1e65c6c831b025399
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon Jun 28 11:56:35 2010 +0200
608657 - add option --consider-full to man page of satellite-sync and to output of
--help
diff --git a/backend/satellite_tools/satellite-sync.sgml
b/backend/satellite_tools/satellite-sync.sgml
index edeb5ac..8802896 100644
--- a/backend/satellite_tools/satellite-sync.sgml
+++ b/backend/satellite_tools/satellite-sync.sgml
@@ -204,6 +204,17 @@ Incrementally synchronize an RHN Satellite's DB data and RPM
repository with Red
</listitem>
</varlistentry>
<varlistentry>
+ <term>--consider-full</term>
+ <listitem>
+ <para>When this option is used, the export being synced from disk dump
will be
+ considered to be a full export; any package in the channel
+ but not in the export will be deleted. Without this option all disk
dumps
+ are interpreted as incremental dumps.
+ This option has sense only for --mount-point.
+ Live sync and ISS are always considered as full sync.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
<term>--rhn-cert</term>
<listitem>
<para>satellite certificate to import(use only with -m
option)</para>
diff --git a/backend/satellite_tools/satsync.py b/backend/satellite_tools/satsync.py
index 1f80c23..b2f12ae 100644
--- a/backend/satellite_tools/satsync.py
+++ b/backend/satellite_tools/satsync.py
@@ -2170,6 +2170,8 @@ def processCommandline():
help='alternative SSL CA Cert (fullpath to cert file)'),
Option('-c','--channel', action='append',
help='process data for this channel only'),
+ Option( '--consider-full', action='store_true',
+ help='disk dump will be considered to be a full export; see "man
satellite-sync" for more information.'),
Option('-d','--db', action='store',
help='alternative database connection string
(username/password@sid)'),
Option( '--debug-level', action='store',
commit 32fe99164ac2a9cc179d32271e55fedfe43d8365
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon Jun 28 11:38:46 2010 +0200
sort command line parameters alphabeticaly
diff --git a/backend/satellite_tools/satsync.py b/backend/satellite_tools/satsync.py
index 28f479f..1f80c23 100644
--- a/backend/satellite_tools/satsync.py
+++ b/backend/satellite_tools/satsync.py
@@ -2164,72 +2164,66 @@ def processCommandline():
log2disk(-1, "Commandline: %s" % repr(sys.argv))
optionsTable = [
- Option('-m','--mount-point', action='store',
- help='source mount point for import - disk update only'),
- Option( '--rhn-cert', action='store',
- help='satellite certificate to import '
- '(use with --mount-point only)'),
- Option('-l','--list-channels',
action='store_true',
- help='list all available channels and exit'),
-
+ Option( '--batch-size', action='store',
+ help='DEBUG ONLY: max. batch-size for XML/database-import processing
(1..%s). "man satellite-sync" for more information.' %
SequenceServer.NEVER_MORE_THAN),
+ Option( '--ca-cert', action='store',
+ help='alternative SSL CA Cert (fullpath to cert file)'),
Option('-c','--channel', action='append',
help='process data for this channel only'),
- Option( '--iss-parent', action='store',
- help='parent satellite to import content from'),
- Option('-p','--print-configuration',
action='store_true',
- help='print the configuration and exit'),
- Option( '--no-ssl', action='store_true',
- help='turn off SSL (not recommended)'),
- Option( '--step', action='store',
- help='synchronize to this step (man satellite-sync for more info)'),
-
- Option( '--no-rpms', action='store_true',
- help='do not download, or process any RPMs'),
- Option( '--no-packages', action='store_true',
- help='do not process full package metadata'),
-
- # DEFERRED:
- #Option( '--source-packages', action='store_true',
help='sync source rpms/metadata as well.'),
- #Option( '--no-srpms', action='store_true',
help='do not download, or process any SRPMs'),
- #Option( '--no-source-packages', action='store_true',
help='do not process source package metadata'),
-
- Option( '--no-errata', action='store_true',
- help='do not process errata data'),
- Option( '--no-kickstarts', action='store_true',
- help='do not process kickstart data (provisioning only)'),
- Option( '--force-all-packages', action='store_true',
- help='forcibly process all (not a diff of) package metadata'),
- Option( '--force-all-errata', action='store_true',
- help='forcibly process all (not a diff of) errata metadata'),
+ Option('-d','--db', action='store',
+ help='alternative database connection string
(username/password@sid)'),
Option( '--debug-level', action='store',
help='override debug level set in /etc/rhn/rhn.conf (which is currently
set at %s).' % CFG.DEBUG),
- Option( '--email', action='store_true',
- help='e-mail a report of what was synced/imported'),
- # server/systemid options: QA/testing purposes only?
- Option( '--traceback-mail', action='store',
- help='alternative email address(es) for sync output (--email
option)'),
- Option('-s','--server', action='store',
- help='alternative server with which to connect (hostname)'),
+ Option( '--dump-version', action='store',
+ help="requested version of XML dump (default: %s)" %
constants.PROTOCOL_VERSION),
+ Option( '--force-all-errata', action='store_true',
+ help='forcibly process all (not a diff of) errata metadata'),
+ Option( '--force-all-packages', action='store_true',
+ help='forcibly process all (not a diff of) package metadata'),
Option( '--http-proxy', action='store',
help='alternative http proxy (hostname:port)'),
Option( '--http-proxy-username', action='store',
help='alternative http proxy username'),
Option( '--http-proxy-password', action='store',
help='alternative http proxy password'),
- Option( '--ca-cert', action='store',
- help='alternative SSL CA Cert (fullpath to cert file)'),
- Option('-d','--db', action='store',
- help='alternative database connection string
(username/password@sid)'),
+ Option( '--iss-parent', action='store',
+ help='parent satellite to import content from'),
+ Option('-l','--list-channels',
action='store_true',
+ help='list all available channels and exit'),
+ Option( '--list-error-codes', action='store_true',
+ help="help on all error codes satellite-sync returns"),
+ Option('-m','--mount-point', action='store',
+ help='source mount point for import - disk update only'),
+ Option( '--no-errata', action='store_true',
+ help='do not process errata data'),
+ Option( '--no-kickstarts', action='store_true',
+ help='do not process kickstart data (provisioning only)'),
+ Option( '--no-packages', action='store_true',
+ help='do not process full package metadata'),
+ Option( '--no-rpms', action='store_true',
+ help='do not download, or process any RPMs'),
+ Option( '--no-ssl', action='store_true',
+ help='turn off SSL (not recommended)'),
Option( '--orgid', action='store',
help='org to which the sync imports data. defaults to the org in the
export'),
+ Option('-p','--print-configuration',
action='store_true',
+ help='print the configuration and exit'),
+ Option( '--rhn-cert', action='store',
+ help='satellite certificate to import '
+ '(use with --mount-point only)'),
+ Option('-s','--server', action='store',
+ help='alternative server with which to connect (hostname)'),
+ Option( '--step', action='store',
+ help='synchronize to this step (man satellite-sync for more info)'),
Option( '--systemid', action='store',
help="DEBUG ONLY: alternative path to digital system id"),
- Option( '--batch-size', action='store',
- help='DEBUG ONLY: max. batch-size for XML/database-import processing
(1..%s). "man satellite-sync" for more information.' %
SequenceServer.NEVER_MORE_THAN),
- Option( '--list-error-codes', action='store_true',
- help="help on all error codes satellite-sync returns"),
- Option( '--dump-version', action='store',
- help="requested version of XML dump (default: %s)" %
constants.PROTOCOL_VERSION),
+ Option( '--traceback-mail', action='store',
+ help='alternative email address(es) for sync output (--email
option)'),
+
+ # DEFERRED:
+ #Option( '--source-packages', action='store_true',
help='sync source rpms/metadata as well.'),
+ #Option( '--no-srpms', action='store_true',
help='do not download, or process any SRPMs'),
+ #Option( '--no-source-packages', action='store_true',
help='do not process source package metadata'),
]
optionParser = OptionParser(option_list=optionsTable)
global OPTIONS