Changes to 'refs/tags/rhn-client-tools-0.9.1-1'
by Miroslav Suchý
Tag 'rhn-client-tools-0.9.1-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2010-02-17 09:23 +0000
Tagging package [rhn-client-tools] version [0.9.1-1] in directory [client/rhel/rhn-client-tools/].
Changes since spacewalk-utils-0.9.3-1:
Jan Pazdziora (5):
Add %check to rhn-client-tools for Fedora 12+, using python-coverage.
We do not have display in koji environment, comment out the testrhnregGui.
Add testRpcServer and haltreetests back to rhn-client-tools tests.
getAdvisoryInfo not called from anywhere, the whole rhnErrata is thus unused, removing.
Removing fedora-core-1 and updates-released for FC1, they no longer have much use.
Miroslav Suchý (2):
564491 - package should be noarch
Automatic commit of package [rhn-client-tools] release [0.9.1-1].
---
client/rhel/rhn-client-tools/Makefile.rhn-client-tools | 33 ------
client/rhel/rhn-client-tools/doc/fedora-core-1 | 20 ----
client/rhel/rhn-client-tools/doc/updates-released | 18 ---
client/rhel/rhn-client-tools/rhn-client-tools.spec | 24 +++-
client/rhel/rhn-client-tools/src/up2date_client/Makefile | 2
client/rhel/rhn-client-tools/src/up2date_client/rhnErrata.py | 55 -----------
client/rhel/rhn-client-tools/test/alltests.py | 11 +-
client/rhel/rhn-client-tools/test/testRhnErrata.py | 39 -------
rel-eng/packages/rhn-client-tools | 2
9 files changed, 28 insertions(+), 176 deletions(-)
---
14 years, 2 months
client/rhel rel-eng/packages
by Miroslav Suchý
client/rhel/rhn-client-tools/rhn-client-tools.spec | 5 ++++-
rel-eng/packages/rhn-client-tools | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 528bcb1b792dc608b67707cbb8354e495ed68421
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Feb 17 10:23:03 2010 +0100
Automatic commit of package [rhn-client-tools] release [0.9.1-1].
diff --git a/client/rhel/rhn-client-tools/rhn-client-tools.spec b/client/rhel/rhn-client-tools/rhn-client-tools.spec
index ebfa2d9..e3746ee 100644
--- a/client/rhel/rhn-client-tools/rhn-client-tools.spec
+++ b/client/rhel/rhn-client-tools/rhn-client-tools.spec
@@ -4,7 +4,7 @@ Group: System Environment/Base
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
URL: https://fedorahosted.org/spacewalk
Name: rhn-client-tools
-Version: 0.9.0
+Version: 0.9.1
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -236,6 +236,9 @@ make -f Makefile.rhn-client-tools test
%{_datadir}/applications/rhn_register.desktop
%changelog
+* Wed Feb 17 2010 Miroslav Suchy <msuchy(a)redhat.com> 0.9.1-1
+- 564491 - package should be noarch
+
* Fri Feb 5 2010 Miroslav Suchy <msuchy(a)redhat.com> 0.8.12-1
- 543509 - found another part of code where we use hal for getting DMI inforation, removing
diff --git a/rel-eng/packages/rhn-client-tools b/rel-eng/packages/rhn-client-tools
index c33fa65..32c1b92 100644
--- a/rel-eng/packages/rhn-client-tools
+++ b/rel-eng/packages/rhn-client-tools
@@ -1 +1 @@
-0.8.12-1 client/rhel/rhn-client-tools/
+0.9.1-1 client/rhel/rhn-client-tools/
14 years, 2 months
client/rhel
by Miroslav Suchý
client/rhel/rhn-client-tools/rhn-client-tools.spec | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
New commits:
commit 236ed5ab5f39d27b1de2a2063beece51928e646f
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Feb 17 10:08:51 2010 +0100
564491 - package should be noarch
fedora version should have been always noarch
additionaly suse do not require it to be python modules arch dependant, can be safely removed
diff --git a/client/rhel/rhn-client-tools/rhn-client-tools.spec b/client/rhel/rhn-client-tools/rhn-client-tools.spec
index e5510f1..ebfa2d9 100644
--- a/client/rhel/rhn-client-tools/rhn-client-tools.spec
+++ b/client/rhel/rhn-client-tools/rhn-client-tools.spec
@@ -7,9 +7,8 @@ Name: rhn-client-tools
Version: 0.9.0
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-%if 0%{?suse_version: %{suse_version} > 1000}
-%{!?suse_version:1}
BuildArch: noarch
+%if 0%{?suse_version}
BuildRequires: update-desktop-files
%endif
14 years, 2 months
client/rhel
by Jan Pazdziora
client/rhel/rhn-client-tools/doc/fedora-core-1 | 20 --------------------
client/rhel/rhn-client-tools/doc/updates-released | 18 ------------------
client/rhel/rhn-client-tools/rhn-client-tools.spec | 1 -
3 files changed, 39 deletions(-)
New commits:
commit 00bb97e02cc62ff6ad33381f73b9b5f2f83e236c
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Feb 17 10:13:01 2010 +0100
Removing fedora-core-1 and updates-released for FC1, they no longer have much use.
diff --git a/client/rhel/rhn-client-tools/doc/fedora-core-1 b/client/rhel/rhn-client-tools/doc/fedora-core-1
deleted file mode 100644
index 9b5e729..0000000
--- a/client/rhel/rhn-client-tools/doc/fedora-core-1
+++ /dev/null
@@ -1,20 +0,0 @@
-http://rpmfind.net/linux/fedora/core/1/$ARCH/os/
-http://distro.ibiblio.org/pub/linux/distributions/fedora/linux/core/1/$ARCH/os/
-http://mirror.eas.muohio.edu/fedora/linux/core/1/$ARCH/os/
-http://mirror.hiwaay.net/redhat/fedora/linux/core/1/$ARCH/os/
-http://ftp.dulug.duke.edu/pub/fedora/linux/core/1/$ARCH/os/
-http://redhat.secsup.org/fedora/core/1/$ARCH/os/
-http://mirror.eas.muohio.edu/fedora/linux/core/1/$ARCH/os/
-http://mirror.hiwaay.net/redhat/fedora/linux/core/1/$ARCH/os/
-http://mirrors.kernel.org/fedora/core/1/$ARCH/os/
-http://ftp.univie.ac.at/systems/linux/fedora/1/$ARCH/os/
-http://redhat.linux.ee/pub/fedora/linux/core/1/$ARCH/os/
-http://ftp.crihan.fr/mirrors/fedora.redhat.com/fedora/linux/core/1/$ARCH/os/
-http://fr2.rpmfind.net/linux/fedora/core/1/$ARCH/os/
-http://wftp.tu-chemnitz.de/pub/linux/fedora-core/1/$ARCH/os/
-http://ftp.ntua.gr/pub/linux/fedora/linux/core/1/$ARCH/os/
-http://ftp.chg.ru/pub/Linux/fedora/linux/core/1/$ARCH/os/
-http://www.mirror.ac.uk/sites/download.fedora.redhat.com/pub/fedora/linux/core/1/$ARCH/os/
-http://zeniiia.linux.org.uk/pub/distributions/fedora/linux/core/1/$ARCH/os/
-http://ftp.kddilabs.jp/Linux/packages/fedora/core/1/$ARCH/os/
-
diff --git a/client/rhel/rhn-client-tools/doc/updates-released b/client/rhel/rhn-client-tools/doc/updates-released
deleted file mode 100644
index bbdcac2..0000000
--- a/client/rhel/rhn-client-tools/doc/updates-released
+++ /dev/null
@@ -1,18 +0,0 @@
-http://rpmfind.net/linux/fedora/core/updates/1/$ARCH/
-http://distro.ibiblio.org/pub/linux/distributions/fedora/linux/core/updates/1/$ARCH/
-http://mirror.eas.muohio.edu/fedora/linux/core/updates/1/$ARCH/
-http://mirror.hiwaay.net/redhat/fedora/linux/core/updates/1/$ARCH/
-http://ftp.dulug.duke.edu/pub/fedora/linux/core/updates/1/$ARCH/
-#http://redhat.secsup.org/fedora/core/updates/1/$ARCH/
-http://mirror.eas.muohio.edu/fedora/linux/core/updates/1/$ARCH/
-http://mirror.hiwaay.net/redhat/fedora/linux/core/updates/1/$ARCH/
-http://mirrors.kernel.org/fedora/core/updates/1/$ARCH/
-http://ftp.univie.ac.at/systems/linux/fedora/updates/1/$ARCH/
-http://redhat.linux.ee/pub/fedora/linux/core/updates/1/$ARCH/
-http://fr2.rpmfind.net/linux/fedora/core/updates/1/$ARCH/
-http://wftp.tu-chemnitz.de/pub/linux/fedora-core/updates/1/$ARCH/
-http://ftp.ntua.gr/pub/linux/fedora/linux/core/updates/1/$ARCH/
-http://ftp.chg.ru/pub/Linux/fedora/linux/core/updates/1/$ARCH/
-http://rpmfind.net/linux/fedora/core/updates/1/$ARCH/
-http://ftp.kddilabs.jp/Linux/packages/fedora/core/updates/1/$ARCH/
-http://www.mirror.ac.uk/sites/download.fedora.redhat.com/pub/fedora/linux/core/updates/1/$ARCH/
diff --git a/client/rhel/rhn-client-tools/rhn-client-tools.spec b/client/rhel/rhn-client-tools/rhn-client-tools.spec
index 3956084..e5510f1 100644
--- a/client/rhel/rhn-client-tools/rhn-client-tools.spec
+++ b/client/rhel/rhn-client-tools/rhn-client-tools.spec
@@ -127,7 +127,6 @@ make -f Makefile.rhn-client-tools test
# some info about mirrors
%doc doc/ChangeLog
%doc doc/mirrors.txt
-%doc doc/fedora-core-1
%doc doc/updates-released
%doc doc/AUTHORS
%doc doc/LICENSE
14 years, 2 months
client/rhel
by Jan Pazdziora
client/rhel/rhn-client-tools/rhn-client-tools.spec | 1
client/rhel/rhn-client-tools/src/up2date_client/Makefile | 2
client/rhel/rhn-client-tools/src/up2date_client/rhnErrata.py | 55 -----------
client/rhel/rhn-client-tools/test/alltests.py | 2
client/rhel/rhn-client-tools/test/testRhnErrata.py | 39 -------
5 files changed, 1 insertion(+), 98 deletions(-)
New commits:
commit 3a4916b64e8558a1b29bda99fba65a92797822d4
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Feb 17 10:09:25 2010 +0100
getAdvisoryInfo not called from anywhere, the whole rhnErrata is thus unused, removing.
diff --git a/client/rhel/rhn-client-tools/rhn-client-tools.spec b/client/rhel/rhn-client-tools/rhn-client-tools.spec
index b1d5475..3956084 100644
--- a/client/rhel/rhn-client-tools/rhn-client-tools.spec
+++ b/client/rhel/rhn-client-tools/rhn-client-tools.spec
@@ -161,7 +161,6 @@ make -f Makefile.rhn-client-tools test
%{_datadir}/rhn/up2date_client/rpmUtils.*
%{_datadir}/rhn/up2date_client/rhnPackageInfo.*
%{_datadir}/rhn/up2date_client/rhnChannel.*
-%{_datadir}/rhn/up2date_client/rhnErrata.*
%{_datadir}/rhn/up2date_client/rhnHardware.*
%{_datadir}/rhn/up2date_client/transaction.*
%{_datadir}/rhn/up2date_client/clientCaps.*
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/Makefile b/client/rhel/rhn-client-tools/src/up2date_client/Makefile
index 7b2689c..b38fa90 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/Makefile
+++ b/client/rhel/rhn-client-tools/src/up2date_client/Makefile
@@ -9,7 +9,7 @@ FILES := config gui hardware progress \
up2dateLog rpmUtils rhnreg transaction \
up2dateErrors rpcServer up2dateAuth \
rhnPackageInfo rhnChannel \
- rhnErrata rhnHardware \
+ rhnHardware \
clientCaps capabilities \
rhnregGui rhnserver \
messageWindow rhncli \
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/rhnErrata.py b/client/rhel/rhn-client-tools/src/up2date_client/rhnErrata.py
deleted file mode 100644
index 7c9e822..0000000
--- a/client/rhel/rhn-client-tools/src/up2date_client/rhnErrata.py
+++ /dev/null
@@ -1,55 +0,0 @@
-
-import up2dateAuth
-import up2dateLog
-import up2dateUtils
-import rhnserver
-import transaction
-import config
-
-
-
-def getAdvisoryInfo(pkg, warningCallback=None):
- log = up2dateLog.initLog()
- cfg = config.initUp2dateConfig()
-
- s = rhnserver.RhnServer()
-
- ts = transaction.initReadOnlyTransaction()
- mi = ts.dbMatch('Providename', pkg[0])
- if not mi:
- return None
-
- # odd,set h to last value in mi. mi has to be iterated
- # to get values from it...
- h = None
- for h in mi:
- break
-
- info = None
-
- # in case of package less errata that somehow apply
- if h:
- try:
- pkgName = "%s-%s-%s" % (h['name'],
- h['version'],
- h['release'])
- log.log_me("getAdvisoryInfo for %s" % pkgName)
- info = s.errata.getPackageErratum(up2dateAuth.getSystemId(), pkg)
- except up2dateErrors.RhnServerException, e:
- if warningCallback:
- warningCallback(e)
- return None
-
- if info:
- return info
-
- try:
- log.log_me("getAdvisoryInfo for %s-0-0" % pkg[0])
- info = s.errata.GetByPackage("%s-0-0" % pkg[0],
- up2dateUtils.getVersion())
- except up2dateErrors.RhnServerException, e:
- if warningCallback:
- warningCallback(e)
- return None
-
- return info
diff --git a/client/rhel/rhn-client-tools/test/alltests.py b/client/rhel/rhn-client-tools/test/alltests.py
index 54930a9..a9efe67 100644
--- a/client/rhel/rhn-client-tools/test/alltests.py
+++ b/client/rhel/rhn-client-tools/test/alltests.py
@@ -24,7 +24,6 @@ import testByteRangeRpcServer
import testClientCaps
import testConfig
import testRhnChannel
-import testRhnErrata
import testRpcServer
import testRpmUtils
import testSSLSocketTimeout
@@ -43,7 +42,6 @@ def suite():
testClientCaps.suite(),
testConfig.suite(),
testRhnChannel.suite(),
- testRhnErrata.suite(),
testRpcServer.suite(),
testRpmUtils.suite(),
testSSLSocketTimeout.suite(),
diff --git a/client/rhel/rhn-client-tools/test/testRhnErrata.py b/client/rhel/rhn-client-tools/test/testRhnErrata.py
deleted file mode 100755
index cc20d1c..0000000
--- a/client/rhel/rhn-client-tools/test/testRhnErrata.py
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/usr/bin/python
-
-import sys
-
-import settestpath
-
-from up2date_client import rhnErrata
-# lots of useful util methods for building/tearing down
-# test enviroments...
-import testutils
-
-import unittest
-
-def write(blip):
- sys.stdout.write("\n|%s|\n" % blip)
-
-class TestRhnErrata(unittest.TestCase):
- def setUp(self):
- self.__setupData()
- testutils.setupConfig("channelTest1")
-
- def __setupData(self):
- pass
-
- def tearDown(self):
- testutils.restoreConfig()
-
- def testGetAdvisoryInfo(self):
- res = rhnErrata.getAdvisoryInfo(["sendmail", "8.12.8", "5.90", ""])
- write(res)
-
-
-def suite():
- suite = unittest.TestSuite()
- suite.addTest(unittest.makeSuite(TestRhnErrata))
- return suite
-
-if __name__ == "__main__":
- unittest.main(argv=sys.argv)
14 years, 2 months
3 commits - client/rhel
by Jan Pazdziora
client/rhel/rhn-client-tools/Makefile.rhn-client-tools | 33 +----------------
client/rhel/rhn-client-tools/rhn-client-tools.spec | 14 +++++++
client/rhel/rhn-client-tools/test/alltests.py | 9 ++--
3 files changed, 21 insertions(+), 35 deletions(-)
New commits:
commit 9bc6bc91a71ac9fd0cbe7f72c743fbd3d52d2a34
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Feb 17 10:01:34 2010 +0100
Add testRpcServer and haltreetests back to rhn-client-tools tests.
diff --git a/client/rhel/rhn-client-tools/test/alltests.py b/client/rhel/rhn-client-tools/test/alltests.py
index 5688d37..54930a9 100644
--- a/client/rhel/rhn-client-tools/test/alltests.py
+++ b/client/rhel/rhn-client-tools/test/alltests.py
@@ -31,6 +31,7 @@ import testSSLSocketTimeout
import testTransactions
import testUp2dateAuth
import testUp2dateUtils
+import haltreetests
### import testrhnregGui
from unittest import TestSuite
@@ -43,14 +44,14 @@ def suite():
testConfig.suite(),
testRhnChannel.suite(),
testRhnErrata.suite(),
-## testRpcServer.suite(),
+ testRpcServer.suite(),
testRpmUtils.suite(),
testSSLSocketTimeout.suite(),
testTransactions.suite(),
testUp2dateAuth.suite(),
testUp2dateUtils.suite(),
### testrhnregGui.suite(),
-## haltreetests.suite()
+ haltreetests.suite()
))
if __name__ == "__main__":
commit b419e78d2f7b6847982816c10e0737516fea42df
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Feb 17 10:00:23 2010 +0100
We do not have display in koji environment, comment out the testrhnregGui.
diff --git a/client/rhel/rhn-client-tools/test/alltests.py b/client/rhel/rhn-client-tools/test/alltests.py
index f4bda16..5688d37 100644
--- a/client/rhel/rhn-client-tools/test/alltests.py
+++ b/client/rhel/rhn-client-tools/test/alltests.py
@@ -31,7 +31,7 @@ import testSSLSocketTimeout
import testTransactions
import testUp2dateAuth
import testUp2dateUtils
-import testrhnregGui
+### import testrhnregGui
from unittest import TestSuite
@@ -49,7 +49,7 @@ def suite():
testTransactions.suite(),
testUp2dateAuth.suite(),
testUp2dateUtils.suite(),
- testrhnregGui.suite(),
+### testrhnregGui.suite(),
## haltreetests.suite()
))
commit cca586e8d33d08d799fdebbfe873c236acd8ed91
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Feb 17 09:59:47 2010 +0100
Add %check to rhn-client-tools for Fedora 12+, using python-coverage.
diff --git a/client/rhel/rhn-client-tools/Makefile.rhn-client-tools b/client/rhel/rhn-client-tools/Makefile.rhn-client-tools
index cf751d8..d0ac0bb 100644
--- a/client/rhel/rhn-client-tools/Makefile.rhn-client-tools
+++ b/client/rhel/rhn-client-tools/Makefile.rhn-client-tools
@@ -44,35 +44,6 @@ rpm: tardist
rpmbuild -ta rhn-client-tools-$(VERSION).tar.gz
test:: clean
-# trace2html is very fragile about what directory it run in and what
-# packages you have to start in when specifying the modules to report
-# on (eg backend.rhnpush... or rhnpush...). To help figure out what to
-# pass to -w, you can try running
-# "python /usr/lib/python2.4/trace.py -mc -C coverage_dir -f counts
-# testall.py" manually from test/ and see what's in coverage_dir/.
+ cd test && coverage run --branch alltests.py || :
+ cd test && coverage report || :
-# Also, at least sometimes, the .pyc files generated by
-# the make all rule don't work or work differently with trace and
-# therefore trace2html. So for now I just clean them all out before
-# running the coverage test.
-
-# Oh yeah, I also can't get the -W option to trace2html to work, which
-# causes the nuisance of needing to list all the modules here.
- cd test && trace2html.py \
- -w ...src.up2date_client.capabilities \
- -w ...src.up2date_client.clientCaps \
- -w ...src.up2date_client.config \
- -w ...src.up2date_client.rhnChannel \
- -w ...src.up2date_client.rhnErrata \
- -w ...src.up2date_client.rpcServer \
- -w ...src.up2date_client.rpmUtils \
- -w ...src.up2date_client.transaction \
- -w ...src.up2date_client.up2dateAuth \
- -w ...src.up2date_client.up2dateErrors \
- -w ...src.up2date_client.up2dateLog \
- -w ...src.up2date_client.up2dateUtils \
- -w ...src.up2date_client.up2wrapperUtils \
- -w ...src.up2date_client.rhnregGui \
- -o ../coverage/ \
- --run-command alltests.py
-#sfghs
diff --git a/client/rhel/rhn-client-tools/rhn-client-tools.spec b/client/rhel/rhn-client-tools/rhn-client-tools.spec
index 03a0fd7..b1d5475 100644
--- a/client/rhel/rhn-client-tools/rhn-client-tools.spec
+++ b/client/rhel/rhn-client-tools/rhn-client-tools.spec
@@ -32,6 +32,15 @@ BuildRequires: gettext
BuildRequires: intltool
BuildRequires: desktop-file-utils
+# The following BuildRequires are for check only
+%if 0%{?fedora} >= 12
+BuildRequires: python-coverage
+BuildRequires: rhnlib
+# python-setuptools can be removed when 556290 gets fixed
+BuildRequires: python-setuptools
+BuildRequires: rpm-python
+%endif
+
%description
Red Hat Network Client Tools provides programs and libraries to allow your
system to receive software updates from Red Hat Network or Spacewalk.
@@ -107,6 +116,11 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%clean
rm -rf $RPM_BUILD_ROOT
+%if 0%{?fedora} >= 12
+%check
+
+make -f Makefile.rhn-client-tools test
+%endif
%files -f %{name}.lang
%defattr(-,root,root,-)
14 years, 2 months
Changes to 'refs/tags/spacewalk-utils-0.9.3-1'
by Michael Mraka
Tag 'spacewalk-utils-0.9.3-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2010-02-16 23:19 +0000
Tagging package [spacewalk-utils] version [0.9.3-1] in directory [utils/].
Changes since spacewalk-admin-0.9.1-1:
Michael Mraka (6):
added an explanation of ini format
spacewalk is child of centos5 - moved on back
simplify code
added base_channel_* macros expansion
fixed activationkey option behavior when creating child channels only
Automatic commit of package [spacewalk-utils] release [0.9.3-1].
---
rel-eng/packages/spacewalk-utils | 2
utils/spacewalk-common-channels | 85 ++++++++++++++++++++----------------
utils/spacewalk-common-channels.ini | 47 +++++++++++++------
utils/spacewalk-utils.spec | 5 +-
4 files changed, 86 insertions(+), 53 deletions(-)
---
14 years, 2 months
rel-eng/packages utils/spacewalk-utils.spec
by Michael Mraka
rel-eng/packages/spacewalk-utils | 2 +-
utils/spacewalk-utils.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 4c781d7b3503e6f4b4b67601c749e3b07ac3632b
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Feb 17 00:19:46 2010 +0100
Automatic commit of package [spacewalk-utils] release [0.9.3-1].
diff --git a/rel-eng/packages/spacewalk-utils b/rel-eng/packages/spacewalk-utils
index 51dc69d..4f6b2df 100644
--- a/rel-eng/packages/spacewalk-utils
+++ b/rel-eng/packages/spacewalk-utils
@@ -1 +1 @@
-0.9.2-1 utils/
+0.9.3-1 utils/
diff --git a/utils/spacewalk-utils.spec b/utils/spacewalk-utils.spec
index 084a77a..4bc807b 100644
--- a/utils/spacewalk-utils.spec
+++ b/utils/spacewalk-utils.spec
@@ -1,7 +1,7 @@
%define rhnroot %{_prefix}/share/rhn
Name: spacewalk-utils
-Version: 0.9.2
+Version: 0.9.3
Release: 1%{?dist}
Summary: Utilities that may be run against a Spacewalk server.
@@ -57,6 +57,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Wed Feb 17 2010 Michael Mraka <michael.mraka(a)redhat.com> 0.9.3-1
+- fixed of spacewalk-common-channels
+
* Mon Feb 15 2010 Michael Mraka <michael.mraka(a)redhat.com> 0.9.2-1
- added spacewalk-common-channels utility
14 years, 2 months
5 commits - utils/spacewalk-common-channels utils/spacewalk-common-channels.ini
by Michael Mraka
utils/spacewalk-common-channels | 85 ++++++++++++++++++++----------------
utils/spacewalk-common-channels.ini | 47 +++++++++++++------
2 files changed, 81 insertions(+), 51 deletions(-)
New commits:
commit c4cab6d5da4bbc77a68da2401de88424a422b60b
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Feb 17 00:14:38 2010 +0100
fixed activationkey option behavior when creating child channels only
diff --git a/utils/spacewalk-common-channels b/utils/spacewalk-common-channels
index 4a30020..8b55880 100755
--- a/utils/spacewalk-common-channels
+++ b/utils/spacewalk-common-channels
@@ -67,7 +67,7 @@ def connect(user, password, server):
def add_channels(channels, section, arch):
base_channels = ['']
- optional = ['activationkey']
+ optional = ['activationkey', 'base_channel_activationkey']
mandatory = ['label', 'name', 'summary', 'checksum', 'arch']
if config.has_option(section, 'base_channels'):
@@ -80,6 +80,9 @@ def add_channels(channels, section, arch):
channel = { 'base_channel': config.get(section, 'base_channel')}
if base_channel:
+ if channel['base_channel'] not in channels:
+ # there isn't such base channel so skip also child
+ continue
# set base channel values so they can be used as macros
for (k,v) in channels[channel['base_channel']].items():
config.set(section, 'base_channel_' + k, v)
@@ -203,7 +206,6 @@ Create everything as well as unlimited activation key for every channel:
else:
raise e
- activationkey = None
if create_channel:
base_info = channels[base_channel_label]
if options.verbose:
@@ -240,13 +242,9 @@ Create everything as well as unlimited activation key for every channel:
[], False)
try:
client.activationkey.create(*ak_args)
- activationkey = "%s-%s" % (org_id, base_info['activationkey'])
except xmlrpclib.Fault, e:
sys.stderr.write("ERROR: %s: %s\n" % (
base_info['label'], e.faultString))
- else:
- # set this in dry run
- activationkey = base_info['activationkey']
else:
# check whether channel exists
try:
@@ -282,7 +280,10 @@ Create everything as well as unlimited activation key for every channel:
child_info['label'], e.faultString))
if options.key_limit is not None:
- if activationkey:
+ if ('base_channel_activationkey' in child_info
+ and child_info['base_channel_activationkey']):
+ activationkey = "%s-%s" % (
+ org_id, child_info['base_channel_activationkey'])
if options.verbose:
sys.stdout.write("** Activation key '%s' - adding child channel...\n" % (
activationkey))
commit 3a157e2c7d5ae8be5cb0461eaa14807e1a490fbe
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Feb 16 23:44:39 2010 +0100
added base_channel_* macros expansion
to be able distinguish e.g. spacewalk for different base channels
diff --git a/utils/spacewalk-common-channels b/utils/spacewalk-common-channels
index ed54441..4a30020 100755
--- a/utils/spacewalk-common-channels
+++ b/utils/spacewalk-common-channels
@@ -68,7 +68,7 @@ def connect(user, password, server):
def add_channels(channels, section, arch):
base_channels = ['']
optional = ['activationkey']
- mandatory = ['label', 'name', 'summary', 'checksum', 'arch', 'base_channel']
+ mandatory = ['label', 'name', 'summary', 'checksum', 'arch']
if config.has_option(section, 'base_channels'):
base_channels = re.split(SPLIT_PATTERN, config.get(section, 'base_channels', 1))
@@ -76,8 +76,13 @@ def add_channels(channels, section, arch):
config.set(section, 'arch', arch)
config.set(section, 'section', section)
for base_channel in base_channels:
- channel = {}
config.set(section, 'base_channel', base_channel)
+ channel = { 'base_channel': config.get(section, 'base_channel')}
+
+ if base_channel:
+ # set base channel values so they can be used as macros
+ for (k,v) in channels[channel['base_channel']].items():
+ config.set(section, 'base_channel_' + k, v)
for k in optional:
if config.has_option(section,k):
@@ -147,33 +152,41 @@ Create everything as well as unlimited activation key for every channel:
client = None
channels = {}
- # read matching channels from config and sort them, base channels first
- for pattern in args:
- for section in fnmatch.filter(config.sections(), pattern):
- archs = re.split(SPLIT_PATTERN, config.get(section, 'archs'))
- if options.archs:
- # filter out archs not set on commandline
- archs = filter(lambda a: a in options.archs, archs)
- for arch in archs:
- add_channels(channels, section, arch)
-
- # list of base_channels to create
+ sections = []
+ # sort base channels first and child last
+ for section in config.sections():
+ if config.has_option(section, 'base_channels'): # child
+ sections.append(section)
+ else: # base
+ sections.insert(0,section)
+ for section in sections:
+ archs = re.split(SPLIT_PATTERN, config.get(section, 'archs'))
+ if options.archs:
+ # filter out archs not set on commandline
+ archs = filter(lambda a: a in options.archs, archs)
+ for arch in archs:
+ add_channels(channels, section, arch)
+
+ # list of base_channels to deal with
base_channels = {}
# list of child_channels for given base_channel
child_channels = {}
- for (name, attr) in channels.items():
- if attr['base_channel']:
- if attr['base_channel'] not in base_channels:
- base_channels[attr['base_channel']] = False
- if attr['base_channel'] in child_channels:
- child_channels[attr['base_channel']].append(name)
+ # filter out non-matching channels
+ for pattern in args:
+ for name in fnmatch.filter(channels.keys(), pattern):
+ attr = channels[name]
+ if attr['base_channel']:
+ if attr['base_channel'] not in base_channels:
+ base_channels[attr['base_channel']] = False
+ if attr['base_channel'] in child_channels:
+ child_channels[attr['base_channel']].append(name)
+ else:
+ child_channels[attr['base_channel']] = [name]
else:
- child_channels[attr['base_channel']] = [name]
- else:
- # this channel is base channel
- base_channels[name] = True
- if name not in child_channels:
- child_channels[name] = []
+ # this channel is base channel
+ base_channels[name] = True
+ if name not in child_channels:
+ child_channels[name] = []
for (base_channel_label, create_channel) in sorted(base_channels.items()):
@@ -276,7 +289,7 @@ Create everything as well as unlimited activation key for every channel:
if not options.dry_run:
try:
client.activationkey.addChildChannels(key, activationkey,
- child_info['label'])
+ [child_info['label']])
except xmlrpclib.Fault, e:
sys.stderr.write("ERROR: %s: %s\n" % (
child_info['label'], e.faultString))
diff --git a/utils/spacewalk-common-channels.ini b/utils/spacewalk-common-channels.ini
index 4a65f2f..f0b674e 100644
--- a/utils/spacewalk-common-channels.ini
+++ b/utils/spacewalk-common-channels.ini
@@ -114,7 +114,7 @@ base_channels = centos5-%(arch)s
[epel5]
label = epel5-%(base_channel)s
-name = EPEL 5 (%(arch)s)
+name = EPEL 5 for %(base_channel_name)s
archs = i386, x86_64, ppc
base_channels = centos5-%(arch)s
@@ -166,19 +166,19 @@ base_channels = centos4-%(arch)s
[epel4]
label = epel4-%(base_channel)s
-name = EPEL 4 (%(arch)s)
+name = EPEL 4 for %(base_channel_name)s
archs = i386, x86_64, ppc
base_channels = centos4-%(arch)s
[spacewalk08-server]
label = spacewalk08-server-%(base_channel)s
-name = Spacewalk Server 0.8 (%(arch)s)
+name = Spacewalk Server 0.8 for %(base_channel_name)s
archs = i386, x86_64
base_channels = fedora12-%(arch)s fedora11-%(arch)s centos5-%(arch)s
[spacewalk08-client]
label = spacewalk08-client-%(base_channel)s
-name = Spacewalk Client 0.8 (%(arch)s)
+name = Spacewalk Client 0.8 for %(base_channel_name)s
archs = i386, x86_64
base_channels = fedora12-%(arch)s fedora11-%(arch)s centos5-%(arch)s
commit 6504c2cddcf778e1ad489027d7a02ce074914f62
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Feb 16 15:06:29 2010 +0100
simplify code
diff --git a/utils/spacewalk-common-channels b/utils/spacewalk-common-channels
index e6cd8ca..ed54441 100755
--- a/utils/spacewalk-common-channels
+++ b/utils/spacewalk-common-channels
@@ -65,8 +65,7 @@ def connect(user, password, server):
key = client.auth.login(user, password)
return client, key
-def setup_channel(section, arch):
- channels = {}
+def add_channels(channels, section, arch):
base_channels = ['']
optional = ['activationkey']
mandatory = ['label', 'name', 'summary', 'checksum', 'arch', 'base_channel']
@@ -86,7 +85,6 @@ def setup_channel(section, arch):
for k in mandatory:
channel[k] = config.get(section, k)
channels[channel['label']] = channel
- return channels
if __name__ == "__main__":
# options parsing
@@ -157,8 +155,7 @@ Create everything as well as unlimited activation key for every channel:
# filter out archs not set on commandline
archs = filter(lambda a: a in options.archs, archs)
for arch in archs:
- channel = setup_channel(section, arch)
- channels.update(channel)
+ add_channels(channels, section, arch)
# list of base_channels to create
base_channels = {}
commit e0b77566e2678f27fca6eca9e52534ab12386247
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Feb 16 11:50:08 2010 +0100
spacewalk is child of centos5 - moved on back
diff --git a/utils/spacewalk-common-channels.ini b/utils/spacewalk-common-channels.ini
index 76a9066..4a65f2f 100644
--- a/utils/spacewalk-common-channels.ini
+++ b/utils/spacewalk-common-channels.ini
@@ -70,18 +70,6 @@ archs = %(_f12_archs)s
checksum = sha256
base_channels = fedora12-%(arch)s
-[spacewalk08-server]
-label = spacewalk08-server-%(base_channel)s
-name = Spacewalk Server 0.8 (%(arch)s)
-archs = i386, x86_64
-base_channels = fedora12-%(arch)s fedora11-%(arch)s centos5-%(arch)s
-
-[spacewalk08-client]
-label = spacewalk08-client-%(base_channel)s
-name = Spacewalk Client 0.8 (%(arch)s)
-archs = i386, x86_64
-base_channels = fedora12-%(arch)s fedora11-%(arch)s centos5-%(arch)s
-
[centos5]
archs = %(_x86_archs)s
name = CentOS 5 (%(arch)s)
@@ -182,3 +170,15 @@ name = EPEL 4 (%(arch)s)
archs = i386, x86_64, ppc
base_channels = centos4-%(arch)s
+[spacewalk08-server]
+label = spacewalk08-server-%(base_channel)s
+name = Spacewalk Server 0.8 (%(arch)s)
+archs = i386, x86_64
+base_channels = fedora12-%(arch)s fedora11-%(arch)s centos5-%(arch)s
+
+[spacewalk08-client]
+label = spacewalk08-client-%(base_channel)s
+name = Spacewalk Client 0.8 (%(arch)s)
+archs = i386, x86_64
+base_channels = fedora12-%(arch)s fedora11-%(arch)s centos5-%(arch)s
+
commit 51f07d9b63dcb49ba3356c448cfa1ae882ac01d5
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Feb 16 11:49:27 2010 +0100
added an explanation of ini format
diff --git a/utils/spacewalk-common-channels.ini b/utils/spacewalk-common-channels.ini
index ebbc2af..76a9066 100644
--- a/utils/spacewalk-common-channels.ini
+++ b/utils/spacewalk-common-channels.ini
@@ -1,3 +1,22 @@
+#
+# These are definitions of common channels and their names in Spacewalk.
+#
+# Every section defines a set channels (base or child) for a given list
+# of architectures.
+#
+# Mandatory options for a section (have to be defined or inherited from [DEFAULT]):
+# label
+# name
+# summary
+# archs
+# checksum
+# Optional options for a section:
+# activationkey
+# base_channels (child channel has to have it)
+#
+# Base channels have to be defined before child channels.
+#
+
[DEFAULT]
label = %(section)s-%(arch)s
checksum = sha1
14 years, 2 months
Changes to 'refs/tags/spacewalk-admin-0.9.1-1'
by Justin Sherrill
Tag 'spacewalk-admin-0.9.1-1' created by Justin Sherrill <jsherril(a)redhat.com> at 2010-02-16 21:51 +0000
Tagging package [spacewalk-admin] version [0.9.1-1] in directory [spacewalk/admin/].
Changes since spacewalk-java-0.9.7-1:
Justin Sherrill (5):
updating satrm.py with better usability and fixing several bugs
renaming satrm script and updateing spec file
removing satrm from makefile
fixing wrong filename in spec file
Automatic commit of package [spacewalk-admin] release [0.9.1-1].
---
backend/satellite_tools/Makefile | 4
backend/satellite_tools/satrm.py | 365 -----------------
backend/satellite_tools/spacewalk-remove-channel | 486 +++++++++++++++++++++++
backend/spacewalk-backend.spec | 2
rel-eng/packages/spacewalk-admin | 2
spacewalk/admin/spacewalk-admin.spec | 7
6 files changed, 496 insertions(+), 370 deletions(-)
---
14 years, 2 months