Branch 'repo-sync' - backend/server backend/spacewalk-backend.spec
by Pradeep Kilambi
backend/server/Makefile | 4 ++--
backend/spacewalk-backend.spec | 6 ++++++
2 files changed, 8 insertions(+), 2 deletions(-)
New commits:
commit 018fcfd031374ef91fbc54d27031e695511a09e4
Author: Pradeep Kilambi <pkilambi(a)redhat.com>
Date: Mon Jul 27 12:51:29 2009 -0400
updating spacewalk backend spec file with reposync stuff
diff --git a/backend/server/Makefile b/backend/server/Makefile
index fbbad78..776fb63 100644
--- a/backend/server/Makefile
+++ b/backend/server/Makefile
@@ -18,8 +18,8 @@ FILES = __init__ \
rhnHandler rhnImport rhnMapping rhnLib rhnPackage \
rhnItem \
rhnKickstart \
- rhnPackageUpload rhnRepository rhnSession rhnUser \
- rhnVirtualization taskomatic
+ rhnPackageUpload basePackageUpload rhnRepository \
+ rhnSession rhnUser rhnVirtualization taskomatic
SUBDIRS = rhnSQL rhnServer action \
handlers importlib action_extra_data \
config_common repomd
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 4037804..1fe9866 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -325,6 +325,7 @@ rm -f %{rhnconf}/rhnSecret.py*
%{rhnroot}/server/rhnItem.py*
%{rhnroot}/server/rhnPackage.py*
%{rhnroot}/server/rhnPackageUpload.py*
+%{rhnroot}/server/basePackageUpload.py*
%{rhnroot}/server/rhnHandler.py*
%{rhnroot}/server/rhnImport.py*
%{rhnroot}/server/rhnLib.py*
@@ -507,6 +508,7 @@ rm -f %{rhnconf}/rhnSecret.py*
%attr(755,root,root) %{_bindir}/spacewalk-debug
%attr(755,root,root) %{_bindir}/rhn-satellite-exporter
%attr(755,root,root) %{_bindir}/update-packages
+%attr(755,root,root) %{_bindir}/spacewalk-repo-sync
%attr(755,root,root) %{_bindir}/rhn-db-stats
%attr(750,root,root) %{_bindir}/satpasswd
%attr(750,root,root) %{_bindir}/satwho
@@ -525,6 +527,7 @@ rm -f %{rhnconf}/rhnSecret.py*
%{rhnroot}/satellite_tools/rhn_ssl_dbstore.py*
%{rhnroot}/satellite_tools/xmlWireSource.py*
%{rhnroot}/satellite_tools/updatePackages.py*
+%{rhnroot}/satellite_tools/reposync.py*
%dir %{rhnroot}/satellite_tools/disk_dumper
%{rhnroot}/satellite_tools/disk_dumper/__init__.py*
%{rhnroot}/satellite_tools/disk_dumper/iss.py*
@@ -534,6 +537,9 @@ rm -f %{rhnconf}/rhnSecret.py*
%{rhnroot}/satellite_tools/disk_dumper/iss_actions.py*
%{rhnroot}/satellite_tools/disk_dumper/dumper.py*
%{rhnroot}/satellite_tools/disk_dumper/string_buffer.py*
+%dir %{rhnroot}/satellite_tools/repo_plugins
+%{rhnroot}/satellite_tools/repo_plugins/__init__.py*
+%{rhnroot}/satellite_tools/repo_plugins/yum_src.py*
%config %attr(644,root,apache) %{rhnconf}/default/rhn_server_iss.conf
%{_mandir}/man8/rhn-satellite-exporter.8*
%{_mandir}/man8/rhn-charsets.8*
14 years, 10 months
Changes to 'refs/tags/SatConfig-cluster-1.54.7-1'
by John Matthews
Tag 'SatConfig-cluster-1.54.7-1' created by John Matthews <jmatthew(a)redhat.com> at 2009-07-27 16:45 +0000
Tagging package [SatConfig-cluster] version [1.54.7-1] in directory [monitoring/SatConfig/cluster/].
Changes since osad-5.9.20-1:
John Matthews (1):
Automatic commit of package [SatConfig-cluster] release [1.54.7-1].
---
monitoring/SatConfig/cluster/SatConfig-cluster.spec | 5 ++++-
rel-eng/packages/SatConfig-cluster | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
---
14 years, 10 months
monitoring/SatConfig rel-eng/packages
by John Matthews
monitoring/SatConfig/cluster/SatConfig-cluster.spec | 5 ++++-
rel-eng/packages/SatConfig-cluster | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 681b5e34f4606635e160f214333b48d1d201acfc
Author: John Matthews <jmatthew(a)redhat.com>
Date: Mon Jul 27 12:45:12 2009 -0400
Automatic commit of package [SatConfig-cluster] release [1.54.7-1].
diff --git a/monitoring/SatConfig/cluster/SatConfig-cluster.spec b/monitoring/SatConfig/cluster/SatConfig-cluster.spec
index c81e30b..6fdc5b7 100644
--- a/monitoring/SatConfig/cluster/SatConfig-cluster.spec
+++ b/monitoring/SatConfig/cluster/SatConfig-cluster.spec
@@ -1,6 +1,6 @@
%define sysv_dir %{_sysconfdir}/rc.d/np.d
Name: SatConfig-cluster
-Version: 1.54.6
+Version: 1.54.7
Release: 1%{?dist}
Summary: Satellite Configuration System - cluster information
URL: https://fedorahosted.org/spacewalk
@@ -57,6 +57,9 @@ install -m 644 SatCluster.pm $RPM_BUILD_ROOT%{perl_vendorlib}/NOCpulse/
rm -rf $RPM_BUILD_ROOT
%changelog
+* Mon Jul 27 2009 John Matthews <jmatthew(a)redhat.com> 1.54.7-1
+- remove warning when run as perl -w (msuchy(a)redhat.com)
+
* Thu Jun 25 2009 John Matthews <jmatthew(a)redhat.com> 1.54.6-1
- 490783 - preventing to read a config file, that must not exist
(tlestach(a)redhat.com)
diff --git a/rel-eng/packages/SatConfig-cluster b/rel-eng/packages/SatConfig-cluster
index d310162..ab988af 100644
--- a/rel-eng/packages/SatConfig-cluster
+++ b/rel-eng/packages/SatConfig-cluster
@@ -1 +1 @@
-1.54.6-1 monitoring/SatConfig/cluster/
+1.54.7-1 monitoring/SatConfig/cluster/
14 years, 10 months
Changes to 'refs/tags/osad-5.9.20-1'
by John Matthews
Tag 'osad-5.9.20-1' created by John Matthews <jmatthew(a)redhat.com> at 2009-07-27 16:44 +0000
Tagging package [osad] version [5.9.20-1] in directory [client/tools/osad/].
Changes since spacewalk-setup-0.6.11-1:
John Matthews (1):
Automatic commit of package [osad] release [5.9.20-1].
---
client/tools/osad/osad.spec | 6 +++++-
rel-eng/packages/osad | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
---
14 years, 10 months
client/tools rel-eng/packages
by John Matthews
client/tools/osad/osad.spec | 6 +++++-
rel-eng/packages/osad | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 6a57166de070de2357ca49cc137aa316e6e8be1a
Author: John Matthews <jmatthew(a)redhat.com>
Date: Mon Jul 27 12:44:14 2009 -0400
Automatic commit of package [osad] release [5.9.20-1].
diff --git a/client/tools/osad/osad.spec b/client/tools/osad/osad.spec
index 16a6b60..3919fa4 100644
--- a/client/tools/osad/osad.spec
+++ b/client/tools/osad/osad.spec
@@ -9,7 +9,7 @@ Group: System Environment/Daemons
License: GPLv2
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 5.9.19
+Version: 5.9.20
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -236,6 +236,10 @@ rpm -ql osa-dispatcher | xargs -n 1 /sbin/restorecon -rvvi {}
# $Id$
%changelog
+* Mon Jul 27 2009 John Matthews <jmatthew(a)redhat.com> 5.9.20-1
+- 512732 - on Fedora 12, it will be just and corenet_udp_bind_generic_node and
+ corenet_udp_bind_all_nodes. (jpazdziora(a)redhat.com)
+
* Mon Jul 27 2009 Jan Pazdziora 5.9.19-1
- 512732 - on Fedora 11, corenet_udp_bind_lo_node is no longer available
- Build osa-dispatcher-selinux again
diff --git a/rel-eng/packages/osad b/rel-eng/packages/osad
index f7a41a1..1121e4e 100644
--- a/rel-eng/packages/osad
+++ b/rel-eng/packages/osad
@@ -1 +1 @@
-5.9.19-1 client/tools/osad/
+5.9.20-1 client/tools/osad/
14 years, 10 months
Branch 'repo-sync' - backend/satellite_tools
by Pradeep Kilambi
backend/satellite_tools/Makefile | 6 +++---
backend/satellite_tools/repo_plugins/__init__.py | 15 +++++++++++++++
2 files changed, 18 insertions(+), 3 deletions(-)
New commits:
commit 629d5ca6cf235df83d60ca0fbaf17055624308b9
Author: Pradeep Kilambi <pkilambi(a)redhat.com>
Date: Mon Jul 27 12:44:23 2009 -0400
updating Makefile with reposync files
diff --git a/backend/satellite_tools/Makefile b/backend/satellite_tools/Makefile
index 9c02dce..d05d130 100644
--- a/backend/satellite_tools/Makefile
+++ b/backend/satellite_tools/Makefile
@@ -6,17 +6,17 @@ TOP = ..
# Specific stuff
SUBDIR = satellite_tools
-SUBDIRS = exporter disk_dumper accounts
+SUBDIRS = exporter disk_dumper accounts repo_plugins
FILES = __init__ connection diskImportLib messages \
progress_bar req_channels satCerts satrm satsync syncCache \
sync_handlers rhn-entitlement-report\
syncLib SequenceServer xmlDiskDumper xmlDiskSource \
xmlSource xmlWireSource rhn_satellite_activate rhn_ssl_dbstore \
- satComputePkgHeaders updatePackages
+ satComputePkgHeaders updatePackages reposync
SCRIPTS = satellite-sync spacewalk-debug\
rhn-schema-version rhn-satellite-activate rhn-charsets \
- rhn-ssl-dbstore update-packages rhn-db-stats
+ rhn-ssl-dbstore update-packages rhn-db-stats spacewalk-repo-sync
# check if we can build man pages
DOCBOOK = $(wildcard /usr/bin/docbook2man)
diff --git a/backend/satellite_tools/repo_plugins/__init__.py b/backend/satellite_tools/repo_plugins/__init__.py
new file mode 100644
index 0000000..fb3600e
--- /dev/null
+++ b/backend/satellite_tools/repo_plugins/__init__.py
@@ -0,0 +1,15 @@
+#
+# Copyright (c) 2008 Red Hat, Inc.
+#
+# This software is licensed to you under the GNU General Public License,
+# version 2 (GPLv2). There is NO WARRANTY for this software, express or
+# implied, including the implied warranties of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
+# along with this software; if not, see
+# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
+#
+# Red Hat trademarks are not licensed under GPLv2. No permission is
+# granted to use or replicate Red Hat trademarks that are incorporated
+# in this software or its documentation.
+#
+
14 years, 10 months
Changes to 'refs/tags/spacewalk-setup-0.6.11-1'
by John Matthews
Tag 'spacewalk-setup-0.6.11-1' created by John Matthews <jmatthew(a)redhat.com> at 2009-07-27 16:34 +0000
Tagging package [spacewalk-setup] version [0.6.11-1] in directory [spacewalk/setup/].
Changes since spacewalk-backend-0.6.26-1:
John Matthews (1):
Automatic commit of package [spacewalk-setup] release [0.6.11-1].
---
rel-eng/packages/spacewalk-setup | 2 +-
spacewalk/setup/spacewalk-setup.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
---
14 years, 10 months
rel-eng/packages spacewalk/setup
by John Matthews
rel-eng/packages/spacewalk-setup | 2 +-
spacewalk/setup/spacewalk-setup.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 2f39def1f047759887e21c3714a7618ba67122f4
Author: John Matthews <jmatthew(a)redhat.com>
Date: Mon Jul 27 12:34:25 2009 -0400
Automatic commit of package [spacewalk-setup] release [0.6.11-1].
diff --git a/rel-eng/packages/spacewalk-setup b/rel-eng/packages/spacewalk-setup
index 85d7245..07033b9 100644
--- a/rel-eng/packages/spacewalk-setup
+++ b/rel-eng/packages/spacewalk-setup
@@ -1 +1 @@
-0.6.10-1 spacewalk/setup/
+0.6.11-1 spacewalk/setup/
diff --git a/spacewalk/setup/spacewalk-setup.spec b/spacewalk/setup/spacewalk-setup.spec
index 8bb58cd..09c6354 100644
--- a/spacewalk/setup/spacewalk-setup.spec
+++ b/spacewalk/setup/spacewalk-setup.spec
@@ -1,5 +1,5 @@
Name: spacewalk-setup
-Version: 0.6.10
+Version: 0.6.11
Release: 1%{?dist}
Summary: Initial setup tools for Red Hat Spacewalk
@@ -100,6 +100,9 @@ rm -rf %{buildroot}
%dir %{_sysconfdir}/pki/spacewalk/jabberd
%changelog
+* Mon Jul 27 2009 John Matthews <jmatthew(a)redhat.com> 0.6.11-1
+- 508187 - Fix jabberd configs on x86_64. (dgoodwin(a)redhat.com)
+
* Tue Jul 21 2009 John Matthews <jmatthew(a)redhat.com> 0.6.10-1
- rhn-load-config.pl - remove accidental 's' (bbuckingham(a)redhat.com)
- 511100 - Fixed upgrade scripts to include cobbler.host (paji(a)redhat.com)
14 years, 10 months
Branch 'repo-sync' - backend/satellite_tools
by Pradeep Kilambi
backend/satellite_tools/repo_plugins/yum_src.py | 9 ++---
backend/satellite_tools/reposync.py | 40 +++++++++++++-----------
backend/satellite_tools/spacewalk-repo-sync | 14 +-------
3 files changed, 29 insertions(+), 34 deletions(-)
New commits:
commit 353e94dfc2ce49c6cd0ba61e4bb67ec901767884
Author: Pradeep Kilambi <pkilambi(a)redhat.com>
Date: Mon Jul 27 12:39:16 2009 -0400
some clean up on repo sync stuff
diff --git a/backend/satellite_tools/repo_plugins/yum_src.py b/backend/satellite_tools/repo_plugins/yum_src.py
index fd39518..fb3859f 100644
--- a/backend/satellite_tools/repo_plugins/yum_src.py
+++ b/backend/satellite_tools/repo_plugins/yum_src.py
@@ -16,8 +16,8 @@
import yum
from yum import config
from reposync import ContentPackage
-class ContentSource:
+class ContentSource:
url = None
name = None
repo = None
@@ -31,7 +31,7 @@ class ContentSource:
repo = yum.yumRepo.YumRepository(self.name)
self.repo = repo
repo.cache = 0
- repo.metadata_expire = 5
+ repo.metadata_expire = 0
repo.baseurl = [self.url]
repo.basecachedir = '/var/cache/rhn/reposync/'
# repo.cachedir = '/var/cache/rhn/reposync/'
@@ -42,7 +42,8 @@ class ContentSource:
to_return = []
for pack in list:
new_pack = ContentPackage()
- new_pack.setNVREA(pack.name, pack.version, pack.release, pack.epoch, pack.arch)
+ new_pack.setNVREA(pack.name, pack.version, pack.release,
+ pack.epoch, pack.arch)
new_pack.unique_id = pack
for cs in pack.checksums:
new_pack.checksums[cs[0]] = cs[1]
@@ -52,5 +53,3 @@ class ContentSource:
def get_package(self, package):
""" get package """
return self.repo.getPackage(package.unique_id)
-
-
diff --git a/backend/satellite_tools/reposync.py b/backend/satellite_tools/reposync.py
index 5abcc1c..0fd24d2 100644
--- a/backend/satellite_tools/reposync.py
+++ b/backend/satellite_tools/reposync.py
@@ -23,8 +23,6 @@ from server.importlib.backendOracle import OracleBackend
from server.importlib.packageImport import ChannelPackageSubscription
class RepoSync:
-
-
parser = None
type = None
url = None
@@ -34,7 +32,6 @@ class RepoSync:
fail = False
repo_label = None
-
def main(self):
initCFG('server')
db_string = CFG.DEFAULT_DB #"rhnsat/rhnsat@rhnsat"
@@ -59,15 +56,14 @@ class RepoSync:
self.repo_label = options.label
self.channel = self.load_channel()
- if not self.channel or not rhnChannel.isCustomChannel(self.channel['id']):
+ if not self.channel or not \
+ rhnChannel.isCustomChannel(self.channel['id']):
print "Channel does not exist or is not custom"
sys.exit(1)
self.plugin = self.load_plugin()(self.url, self.channel_label + "-" + self.repo_label)
self.import_packages(self.plugin.list_packages())
-
-
def process_args(self):
self.parser = OptionParser()
self.parser.add_option('-u', '--url', action='store', dest='url', help='The url to sync')
@@ -76,7 +72,6 @@ class RepoSync:
self.parser.add_option('-l', '--label', action='store', dest='label', help='A friendly label to refer to the repo')
self.parser.add_option('-f', '--fail', action='store_true', dest='fail', default=False , help="If a package import fails, fail the entire operation")
return self.parser.parse_args()
-
def load_plugin(self):
sys.path.append("repo_plugins")
@@ -94,18 +89,24 @@ class RepoSync:
elif pack.checksums.has_key('sha256'):
"""lookup by sha256"""
if pid == None:
- if self.channel_label not in rhnPackage.get_channels_for_package([pack.name, pack.version, pack.release, pack.epoch, pack.arch]) and \
- self.channel_label not in rhnPackage.get_channels_for_package([pack.name, pack.version, pack.release, '', pack.arch]):
+ if self.channel_label not in \
+ rhnPackage.get_channels_for_package([pack.name, \
+ pack.version, pack.release, pack.epoch, pack.arch]) and \
+ self.channel_label not in \
+ rhnPackage.get_channels_for_package([pack.name, \
+ pack.version, pack.release, '', pack.arch]):
to_download.append(pack)
for (index, pack) in enumerate(to_download):
"""download each package"""
try:
- print(str(index) + "/" + str(len(to_download)) + " : "+ pack.getNVREA())
+ print(str(index) + "/" + str(len(to_download)) + " : "+ \
+ pack.getNVREA())
path = self.plugin.get_package(pack)
md5 = rhnLib.getFileMD5(filename=path)
- pid = rhnPackage.get_package_for_md5sum(self.channel['org_id'], md5)
+ pid = rhnPackage.get_package_for_md5sum(
+ self.channel['org_id'], md5)
if pid is None:
self.upload_package(pack, path, md5)
self.associate_package(pack, md5)
@@ -138,7 +139,8 @@ class RepoSync:
package_dict, diff_level = rhnPackageUpload.push_package(header,
payload_stream, md5sum, force=False,
header_start=header_start, header_end=header_end,
- relative_path=rel_package_path, org_id=self.channel['org_id'])
+ relative_path=rel_package_path,
+ org_id=self.channel['org_id'])
temp_file.close()
if self.url.find("file://") < 0:
os.remove(path)
@@ -158,21 +160,26 @@ class RepoSync:
package['epoch'] = pack.epoch
package['arch'] = pack.arch
package['md5sum'] = md5sum
- package['channels'] = [{'label':self.channel_label, 'id':self.channel['id']}]
+ package['channels'] = [{'label':self.channel_label,
+ 'id':self.channel['id']}]
package['org_id'] = self.channel['org_id']
try:
- importer = ChannelPackageSubscription([IncompletePackage().populate(package)], backend, caller=caller)
+ importer = ChannelPackageSubscription(
+ [IncompletePackage().populate(package)],
+ backend, caller=caller)
importer.run()
except:
package['epoch'] = '0'
- importer = ChannelPackageSubscription([IncompletePackage().populate(package)], backend, caller=caller)
+ importer = ChannelPackageSubscription(
+ [IncompletePackage().populate(package)],
+ backend, caller=caller)
importer.run()
backend.commit()
+
def load_channel(self):
return rhnChannel.channel_info(self.channel_label)
-
class ContentPackage:
#map of checksums. Valid keys are 'md5sum' & 'sha256'
@@ -198,4 +205,3 @@ class ContentPackage:
return self.name + '-' + self.version + '-' + self.release + '-' + self.epoch + '.' + self.arch
else:
return self.name + '-' + self.version + '-' + self.release + '.' + self.arch
-
diff --git a/backend/satellite_tools/spacewalk-repo-sync b/backend/satellite_tools/spacewalk-repo-sync
index 244c260..a14ad76 100755
--- a/backend/satellite_tools/spacewalk-repo-sync
+++ b/backend/satellite_tools/spacewalk-repo-sync
@@ -22,7 +22,6 @@ if __name__ != '__main__':
import sys
def systemExit(code, msgs=None):
"Exit with a code and optional message(s). Saved a few lines of code."
-
if msgs:
if type(msgs) not in [type([]), type(())]:
msgs = (msgs, )
@@ -30,7 +29,6 @@ def systemExit(code, msgs=None):
sys.stderr.write(str(msg)+'\n')
sys.exit(code)
-
try:
import os
import socket
@@ -45,16 +43,12 @@ except ImportError:
sys.stderr.write("Unable to find RHN code tree.\n"
"Path not correct? '%s'\n" % _LIBPATH)
-
-
-
def releaseLOCK():
global LOCK
if LOCK:
LOCK.release()
LOCK = None
-
def main():
# quick check to see if you are a super-user.
@@ -62,19 +56,16 @@ def main():
sys.stderr.write('ERROR: must be root to execute\n')
sys.exit(8)
-
LOCK = None
try:
- LOCK = rhnLockfile.Lockfile('/var/run/spacewalk-sync.pid')
+ LOCK = rhnLockfile.Lockfile('/var/run/spacewalk-repo-sync.pid')
except rhnLockfile.LockfileLockedException:
- systemExit(1, "SYNC ERROR: attempting to run more than one instance of satellite-sync. Exiting.")
-
+ systemExit(1, "ERROR: attempting to run more than one instance of spacewalk-repo-sync Exiting.")
sync = reposync.RepoSync()
sync.main()
releaseLOCK()
return 0
-
if __name__ == '__main__':
try:
sys.exit(abs(main() or 0))
@@ -86,4 +77,3 @@ if __name__ == '__main__':
except Exception, e:
releaseLOCK()
raise
-
14 years, 10 months
Changes to 'refs/tags/spacewalk-backend-0.6.26-1'
by John Matthews
Tag 'spacewalk-backend-0.6.26-1' created by John Matthews <jmatthew(a)redhat.com> at 2009-07-27 16:23 +0000
Tagging package [spacewalk-backend] version [0.6.26-1] in directory [backend/].
Changes since nocpulse-common-2.1.17-1:
Devan Goodwin (1):
Add run-updater to sample answers.txt.
John Matthews (1):
Automatic commit of package [spacewalk-backend] release [0.6.26-1].
---
backend/spacewalk-backend.spec | 6 +++++-
rel-eng/packages/spacewalk-backend | 2 +-
satellite/install/answers.txt | 6 ++++++
3 files changed, 12 insertions(+), 2 deletions(-)
---
14 years, 10 months