spacewalk-commits October 2013

spacewalk-commits@lists.fedorahosted.org

11 participants
189 discussions

Changes to 'refs/tags/spacewalk-reports-2.1.13-1'
by Tomáš Kašpárek 01 Oct '13

01 Oct '13

Tag 'spacewalk-reports-2.1.13-1' created by Tomas Kasparek <tkasparek(a)redhat.com> at 2013-10-01 15:30 +0000 Tagging package [spacewalk-reports] version [2.1.13-1] in directory [reporting/]. Changes since spacewalk-reports-2.1.12-1: Tomas Kasparek (3): 1009462 - display error message for --(like|where)=<column-id> 1012261 - report system virtualization type Automatic commit of package [spacewalk-reports] release [2.1.13-1]. --- rel-eng/packages/spacewalk-reports | 2 +- reporting/reports/data/inventory | 4 +++- reporting/spacewalk-report | 2 ++ reporting/spacewalk-reports.spec | 6 +++++- 4 files changed, 11 insertions(+), 3 deletions(-) ---

1 0

rel-eng/packages reporting/spacewalk-reports.spec
by Tomáš Kašpárek 01 Oct '13

01 Oct '13

rel-eng/packages/spacewalk-reports | 2 +- reporting/spacewalk-reports.spec | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) New commits: commit b6914527aa0d3920fe201db4d4a6440412070959 Author: Tomas Kasparek <tkasparek(a)redhat.com> Date: Tue Oct 1 17:30:02 2013 +0200 Automatic commit of package [spacewalk-reports] release [2.1.13-1]. diff --git a/rel-eng/packages/spacewalk-reports b/rel-eng/packages/spacewalk-reports index b38d861..33eb8af 100644 --- a/rel-eng/packages/spacewalk-reports +++ b/rel-eng/packages/spacewalk-reports @@ -1 +1 @@ -2.1.12-1 reporting/ +2.1.13-1 reporting/ diff --git a/reporting/spacewalk-reports.spec b/reporting/spacewalk-reports.spec index bf2a129..a607467 100644 --- a/reporting/spacewalk-reports.spec +++ b/reporting/spacewalk-reports.spec @@ -2,7 +2,7 @@ Name: spacewalk-reports Summary: Script based reporting Group: Applications/Internet License: GPLv2 -Version: 2.1.12 +Version: 2.1.13 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -43,6 +43,10 @@ rm -rf $RPM_BUILD_ROOT %doc COPYING %changelog +* Tue Oct 01 2013 Tomas Kasparek <tkasparek(a)redhat.com> 2.1.13-1 +- 1012261 - report system virtualization type +- 1009462 - display error message for --(like|where)=<column-id> + * Tue Oct 01 2013 Tomas Kasparek <tkasparek(a)redhat.com> 2.1.12-1 - using bind variable in postgres

1 0

reporting/reports
by Tomáš Kašpárek 01 Oct '13

01 Oct '13

reporting/reports/data/inventory | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) New commits: commit 7a59ed592f7b85b33d6f031e6136a8573d7b368b Author: Tomas Kasparek <tkasparek(a)redhat.com> Date: Tue Oct 1 17:23:14 2013 +0200 1012261 - report system virtualization type diff --git a/reporting/reports/data/inventory b/reporting/reports/data/inventory index 09d54fa..1bdc406 100644 --- a/reporting/reports/data/inventory +++ b/reporting/reports/data/inventory @@ -29,6 +29,7 @@ columns: virtual_host:i System identifier of host, if system is a guest architecture Architecture of the system is_virtualized Information whether system is virtualized or not + virt_type System virtualization type osad_status OSAD status hardware Hardware information @@ -47,7 +48,7 @@ sql: registration_time, last_checkin_time, kernel_version, packages_out_of_date, errata_out_of_date, software_channel, configuration_channel, - entitlements, system_group, organization, virtual_host, architecture, is_virtualized, osad_status, hardware + entitlements, system_group, organization, virtual_host, architecture, is_virtualized, virt_type, osad_status, hardware from ( select rhnserver.id as server_id, rhnserver.name as profile_name, rhnservernetwork.hostname, trim(rhnservernetwork.ipaddr) as ip_address, @@ -78,6 +79,7 @@ sql: ) as architecture, (case when (select rhnVirtualInstance.virtual_system_id from rhnVirtualInstance where rhnVirtualInstance.virtual_system_id=rhnserver.id) is null then 'No' else 'Yes' end ) as is_virtualized, + (select rvit.name from rhnvirtualinstance rvi inner join rhnvirtualinstanceinfo rvii on rvi.id = rvii.instance_id inner join rhnvirtualinstancetype rvit on rvii.instance_type = rvit.id where rvi.virtual_system_id = rhnserver.id) as virt_type, (nvl((select rhnpushclientstate.label from rhnpushclient join rhnpushclientstate on rhnpushclient.state_id=rhnpushclientstate.id where rhnpushclient.server_id=rhnServer.id), 'Not enabled')) as osad_status, get_hw_info_as_clob(rhnserver.id, '; ') as hardware from rhnserver left outer join

1 0

reporting/spacewalk-report
by Tomáš Kašpárek 01 Oct '13

01 Oct '13

reporting/spacewalk-report | 2 ++ 1 file changed, 2 insertions(+) New commits: commit f29691fbb0a540ff206fee0d06e0e431d78f27af Author: Tomas Kasparek <tkasparek(a)redhat.com> Date: Tue Oct 1 16:35:42 2013 +0200 1009462 - display error message for --(like|where)=<column-id> diff --git a/reporting/spacewalk-report b/reporting/spacewalk-report index 8373002..5aa97ad 100755 --- a/reporting/spacewalk-report +++ b/reporting/spacewalk-report @@ -113,6 +113,8 @@ def processCommandline(): where[k] = [ v ] if like: where_like.append(k) + elif sys.argv[i].startswith('--where=') or sys.argv[i].startswith('--like='): + optionParser.error('no such option: %s' % sys.argv[i]) i += 1

1 0

Changes to 'refs/tags/spacewalk-reports-2.1.12-1'
by Tomáš Kašpárek 01 Oct '13

01 Oct '13

Tag 'spacewalk-reports-2.1.12-1' created by Tomas Kasparek <tkasparek(a)redhat.com> at 2013-10-01 12:27 +0000 Tagging package [spacewalk-reports] version [2.1.12-1] in directory [reporting/]. Changes since spacewalk-search-2.1.2-1: Michael Mraka (1): 923338 - replace application code with database lookup to prevent conflicting inserts Tomas Kasparek (2): using bind variable in postgres Automatic commit of package [spacewalk-reports] release [2.1.12-1]. --- backend/server/importlib/backend.py | 43 +++--------------------------------- rel-eng/packages/spacewalk-reports | 2 - reporting/spacewalk-report | 3 +- reporting/spacewalk-reports.spec | 5 +++- 4 files changed, 11 insertions(+), 42 deletions(-) ---

1 0

rel-eng/packages reporting/spacewalk-reports.spec
by Tomáš Kašpárek 01 Oct '13

01 Oct '13

rel-eng/packages/spacewalk-reports | 2 +- reporting/spacewalk-reports.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) New commits: commit e345721414ebf4f70389f9fb46821cb8337ef0e0 Author: Tomas Kasparek <tkasparek(a)redhat.com> Date: Tue Oct 1 14:27:35 2013 +0200 Automatic commit of package [spacewalk-reports] release [2.1.12-1]. diff --git a/rel-eng/packages/spacewalk-reports b/rel-eng/packages/spacewalk-reports index 3ace7ee..b38d861 100644 --- a/rel-eng/packages/spacewalk-reports +++ b/rel-eng/packages/spacewalk-reports @@ -1 +1 @@ -2.1.11-1 reporting/ +2.1.12-1 reporting/ diff --git a/reporting/spacewalk-reports.spec b/reporting/spacewalk-reports.spec index f44ab81..bf2a129 100644 --- a/reporting/spacewalk-reports.spec +++ b/reporting/spacewalk-reports.spec @@ -2,7 +2,7 @@ Name: spacewalk-reports Summary: Script based reporting Group: Applications/Internet License: GPLv2 -Version: 2.1.11 +Version: 2.1.12 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -43,6 +43,9 @@ rm -rf $RPM_BUILD_ROOT %doc COPYING %changelog +* Tue Oct 01 2013 Tomas Kasparek <tkasparek(a)redhat.com> 2.1.12-1 +- using bind variable in postgres + * Mon Sep 30 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.11-1 - select from rhnServerNeededCache instead of rhnServerNeededPackageCache

1 0

reporting/spacewalk-report
by Tomáš Kašpárek 01 Oct '13

01 Oct '13

reporting/spacewalk-report | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit dc0994915eafce4cb1e82b7e5251fd3d0d9700f3 Author: Tomas Kasparek <tkasparek(a)redhat.com> Date: Tue Oct 1 14:11:00 2013 +0200 using bind variable in postgres diff --git a/reporting/spacewalk-report b/reporting/spacewalk-report index 5a84e94..8373002 100755 --- a/reporting/spacewalk-report +++ b/reporting/spacewalk-report @@ -206,7 +206,8 @@ if __name__ == '__main__': if CFG.DB_BACKEND == 'oracle': rhnSQL.execute('alter session set time_zone = \'%s\'' % options.timezone) else: - rhnSQL.execute('set session timezone to \'%s\'' % options.timezone) + tz = rhnSQL.prepare('set session timezone to :tz') + tz.execute(tz=options.timezone) h = rhnSQL.prepare(the_sql) h.execute(**dict(report.params.items() + the_dict_where.items()))

1 0

backend/server
by Michael Mraka 01 Oct '13

01 Oct '13

backend/server/importlib/backend.py | 43 +++--------------------------------- 1 file changed, 4 insertions(+), 39 deletions(-) New commits: commit b61d9c9137668adf767229dd14ec01b46acea496 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Tue Sep 24 15:33:24 2013 +0200 923338 - replace application code with database lookup to prevent conflicting inserts addressing Traceback (most recent call last): ... File "/usr/share/rhn/upload_server/handlers/package_push/package_push.py", line 125, in handler relative_path=self.rel_package_path, org_id=self.org_id) File "/usr/lib/python2.6/site-packages/spacewalk/server/rhnPackageUpload.py", line 144, in push_package importer.run() File "/usr/lib/python2.6/site-packages/spacewalk/server/importlib/importLib.py", line 646, in run self.fix() File "/usr/lib/python2.6/site-packages/spacewalk/server/importlib/packageImport.py", line 289, in fix self.backend.processCapabilities(self.capabilities) File "/usr/lib/python2.6/site-packages/spacewalk/server/importlib/backend.py", line 128, in processCapabilities h.executemany(id=toinsert[0], name=toinsert[1], version=toinsert[2]) File "/usr/lib/python2.6/site-packages/spacewalk/server/rhnSQL/sql_base.py", line 172, in executemany return apply(self._execute_wrapper, (self._executemany, ) + p, kw) File "/usr/lib/python2.6/site-packages/spacewalk/server/rhnSQL/driver_cx_Oracle.py", line 108, in _execute_wrapper retval = apply(function, p, kw) File "/usr/lib/python2.6/site-packages/spacewalk/server/rhnSQL/driver_cx_Oracle.py", line 208, in _executemany self._real_cursor.executemany(None, arr) SQLError: (1, 'ORA-00001: unique constraint (SAT56STAGE.RHN_PKG_CAP_NAME_VERSION_UQ) violated\\n', 'insert into rhnPackageCapability (id, name, version) values (:id, :name, :version)') diff --git a/backend/server/importlib/backend.py b/backend/server/importlib/backend.py index 2ade497..f907794 100644 --- a/backend/server/importlib/backend.py +++ b/backend/server/importlib/backend.py @@ -83,49 +83,14 @@ class Backend: sth.execute() def processCapabilities(self, capabilityHash): - # First figure out which capabilities are already inserted - templ = """ - select /*+index(rhnPackageCapability rhn_pkg_cap_name_version_uq)*/ id - from rhnPackageCapability - where name = :name - and version %s""" - sqlNonNull = templ % "= :version" - sqlNull = templ % "is null" - nullStatement = None - nonnullStatement = None - toinsert = [[], [], []] + h = self.dbmodule.prepare("select lookup_package_capability(:name, :version) as id from dual") for name, version in capabilityHash.keys(): ver = version if version is None or version == '': ver = None - if not nullStatement: - nullStatement = self.dbmodule.prepare(sqlNull) - nullStatement.execute(name=name) - row = nullStatement.fetchone_dict() - else: - if not nonnullStatement: - nonnullStatement = self.dbmodule.prepare(sqlNonNull) - nonnullStatement.execute(name=name, version=version) - row = nonnullStatement.fetchone_dict() - if row: - capabilityHash[(name, version)] = row['id'] - continue - # Generate an id - id = self.sequences['rhnPackageCapability'].next() - capabilityHash[(name, version)] = id - toinsert[0].append(id) - toinsert[1].append(name) - toinsert[2].append(ver) - if not toinsert[0]: - # Nothing to do - return - sql = """ - insert into rhnPackageCapability - (id, name, version) values - (:id, :name, :version) - """ - h = self.dbmodule.prepare(sql) - h.executemany(id=toinsert[0], name=toinsert[1], version=toinsert[2]) + h.execute(name = name, version = ver) + row = h.fetchone_dict() + capabilityHash[(name, version)] = row['id'] def processChangeLog(self, changelogHash): sql = "select id from rhnPackageChangeLogData where name = :name and time = :time and text = :text"

1 0

Changes to 'refs/tags/spacewalk-search-2.1.2-1'
by Michael Mraka 01 Oct '13

01 Oct '13

Tag 'spacewalk-search-2.1.2-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2013-10-01 07:14 +0000 Tagging package [spacewalk-search] version [2.1.2-1] in directory [search-server/spacewalk-search/]. Changes since spacewalk-web-2.1.22-1: Michael Mraka (1): Automatic commit of package [spacewalk-search] release [2.1.2-1]. --- rel-eng/packages/spacewalk-search | 2 +- search-server/spacewalk-search/spacewalk-search.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) ---

1 0

rel-eng/packages search-server/spacewalk-search
by Michael Mraka 01 Oct '13

01 Oct '13

rel-eng/packages/spacewalk-search | 2 +- search-server/spacewalk-search/spacewalk-search.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) New commits: commit 6bd1cd84877b8a182487f3231d8cea966c678ea6 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Tue Oct 1 09:14:46 2013 +0200 Automatic commit of package [spacewalk-search] release [2.1.2-1]. diff --git a/rel-eng/packages/spacewalk-search b/rel-eng/packages/spacewalk-search index 7bca0da..4fd027d 100644 --- a/rel-eng/packages/spacewalk-search +++ b/rel-eng/packages/spacewalk-search @@ -1 +1 @@ -2.1.1-1 search-server/spacewalk-search/ +2.1.2-1 search-server/spacewalk-search/ diff --git a/search-server/spacewalk-search/spacewalk-search.spec b/search-server/spacewalk-search/spacewalk-search.spec index ea51491..209f918 100644 --- a/search-server/spacewalk-search/spacewalk-search.spec +++ b/search-server/spacewalk-search/spacewalk-search.spec @@ -4,7 +4,7 @@ Name: spacewalk-search Summary: Spacewalk Full Text Search Server Group: Applications/Internet License: GPLv2 -Version: 2.1.1 +Version: 2.1.2 Release: 1%{?dist} # This src.rpm is cannonical upstream # You can obtain it using this set of commands @@ -182,6 +182,9 @@ fi %attr(755, root, root) %{_var}/lib/rhn/search/indexes/docs %changelog +* Tue Oct 01 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.2-1 +- 1013629 - clean up old help links + * Mon Sep 30 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.1-1 - removed trailing whitespaces

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

spacewalk-commits October 2013