spacewalk-commits April 2009

spacewalk-commits@lists.fedorahosted.org

21 participants
741 discussions

backend/common
by Pradeep Kilambi 02 Apr '09

02 Apr '09

backend/common/rhn_rpm.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 80f78dc0fcbe4d41aa59ff4119a9eb44972132cc Author: Pradeep Kilambi <pkilambi(a)redhat.com> Date: Thu Apr 2 16:15:28 2009 -0400 check the attr instead of try catch diff --git a/backend/common/rhn_rpm.py b/backend/common/rhn_rpm.py index 3b622e6..3d0efcc 100644 --- a/backend/common/rhn_rpm.py +++ b/backend/common/rhn_rpm.py @@ -268,12 +268,12 @@ def get_package_header(filename=None, file=None, fd=None): if hdr is None: raise InvalidPackageError else: - try: + if hasattr(rpm, 'rpmHeaderFromFD'): header_start, header_end = \ get_header_byte_range(os.fdopen(os.dup(file_desc))) os.lseek(file_desc, header_start, 0) hdr, offset = rpm.readHeaderFromFD(file_desc) - except AttributeError: + else: # RHEL-4 and older, do the old way ts = RPMReadOnlyTransaction() nomd5 = getattr(rpm, 'RPMVSF_NOMD5')

1 0

Branch 'VADER' - backend/common
by Pradeep Kilambi 02 Apr '09

02 Apr '09

backend/common/rhn_rpm.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 0b95c82d4305a40b9661abd48a4a28b670326d66 Author: Pradeep Kilambi <pkilambi(a)redhat.com> Date: Thu Apr 2 16:15:28 2009 -0400 check the attr instead of try catch diff --git a/backend/common/rhn_rpm.py b/backend/common/rhn_rpm.py index 3b622e6..3d0efcc 100644 --- a/backend/common/rhn_rpm.py +++ b/backend/common/rhn_rpm.py @@ -268,12 +268,12 @@ def get_package_header(filename=None, file=None, fd=None): if hdr is None: raise InvalidPackageError else: - try: + if hasattr(rpm, 'rpmHeaderFromFD'): header_start, header_end = \ get_header_byte_range(os.fdopen(os.dup(file_desc))) os.lseek(file_desc, header_start, 0) hdr, offset = rpm.readHeaderFromFD(file_desc) - except AttributeError: + else: # RHEL-4 and older, do the old way ts = RPMReadOnlyTransaction() nomd5 = getattr(rpm, 'RPMVSF_NOMD5')

1 0

Branch 'VADER' - java/code
by Justin Sherrill 02 Apr '09

02 Apr '09

java/code/src/com/redhat/rhn/common/db/datasource/xml/General_queries.xml | 2 ++ 1 file changed, 2 insertions(+) New commits: commit 83bc9c02cc1f55425e22b8bfd53beaa3fcb234c7 Author: Justin Sherrill <jsherril(a)redhat.com> Date: Thu Apr 2 16:01:49 2009 -0400 485317 - fixing issue where phantom kickstart sessions would show up on the kickstart overview diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/General_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/General_queries.xml index a50fc70..827b90a 100644 --- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/General_queries.xml +++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/General_queries.xml @@ -145,6 +145,8 @@ ORDER BY KSIPR.min AND KSS.kickstart_id = KSD.id AND KSS.state_id = KSST.id AND KSST.label = 'created' + and ( KSS.client_ip is not null or KSS.old_server_id is not null) + order by last_modified desc </query> </mode>

1 0

java/code
by Justin Sherrill 02 Apr '09

02 Apr '09

java/code/src/com/redhat/rhn/common/db/datasource/xml/General_queries.xml | 2 ++ 1 file changed, 2 insertions(+) New commits: commit 27a5f7dacac94fcd4a6a3ab1a3d39bc0ba712386 Author: Justin Sherrill <jsherril(a)redhat.com> Date: Thu Apr 2 16:01:49 2009 -0400 485317 - fixing issue where phantom kickstart sessions would show up on the kickstart overview diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/General_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/General_queries.xml index a50fc70..827b90a 100644 --- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/General_queries.xml +++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/General_queries.xml @@ -145,6 +145,8 @@ ORDER BY KSIPR.min AND KSS.kickstart_id = KSD.id AND KSS.state_id = KSST.id AND KSST.label = 'created' + and ( KSS.client_ip is not null or KSS.old_server_id is not null) + order by last_modified desc </query> </mode>

1 0

backend/common
by Pradeep Kilambi 02 Apr '09

02 Apr '09

backend/common/rhn_rpm.py | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) New commits: commit 9ac877df3528140cb5c583e1e1779b2d3574c7bf Author: Pradeep Kilambi <pkilambi(a)redhat.com> Date: Thu Apr 2 15:50:02 2009 -0400 493583 - fixing the rhnpush to call old rpm libraries for RHEL-4 diff --git a/backend/common/rhn_rpm.py b/backend/common/rhn_rpm.py index 93b87d5..3b622e6 100644 --- a/backend/common/rhn_rpm.py +++ b/backend/common/rhn_rpm.py @@ -268,10 +268,19 @@ def get_package_header(filename=None, file=None, fd=None): if hdr is None: raise InvalidPackageError else: - header_start, header_end = \ - get_header_byte_range(os.fdopen(os.dup(file_desc))) - os.lseek(file_desc, header_start, 0) - hdr, offset = rpm.readHeaderFromFD(file_desc) + try: + header_start, header_end = \ + get_header_byte_range(os.fdopen(os.dup(file_desc))) + os.lseek(file_desc, header_start, 0) + hdr, offset = rpm.readHeaderFromFD(file_desc) + except AttributeError: + # RHEL-4 and older, do the old way + ts = RPMReadOnlyTransaction() + nomd5 = getattr(rpm, 'RPMVSF_NOMD5') + needpayload = getattr(rpm, 'RPMVSF_NEEDPAYLOAD') + ts.pushVSFlags(~(nomd5 | needpayload)) + hdr = RPMReadOnlyTransaction().hdrFromFdno(file_desc) + ts.popVSFlags() if hdr is None: raise InvalidPackageError is_source = hdr[getattr(rpm, 'RPMTAG_SOURCEPACKAGE')]

3 2

Branch 'SPACEWALK-0.5' - backend/satellite_tools
by Pradeep Kilambi 02 Apr '09

02 Apr '09

backend/satellite_tools/satCerts.py | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) New commits: commit 6770e3b00584dedb5dfe84a90c488fb97ef1c506 Author: Pradeep Kilambi <pkilambi(a)redhat.com> Date: Thu Apr 2 10:54:35 2009 -0400 adding some additional checks before creating first org info diff --git a/backend/satellite_tools/satCerts.py b/backend/satellite_tools/satCerts.py index 1327ac3..5d05cad 100644 --- a/backend/satellite_tools/satCerts.py +++ b/backend/satellite_tools/satCerts.py @@ -543,6 +543,16 @@ def create_first_private_chan_family(): Check to see if org has a channelfamily associated with it. If not, Create one. """ + _lookup_chfam = """ + SELECT 1 from rhnChannelFamily + WHERE label='private-channel-family-1' + """ + h = rhnSQL.prepare(_lookup_chfam) + row = h.execute() + # some extra check for upgrades + if row: + # Already exists, move on + return _query_create_chfam = """ INSERT INTO rhnChannelFamily (id, name, label, org_id, product_url) @@ -550,10 +560,14 @@ def create_first_private_chan_family(): """ h = rhnSQL.prepare(_query_create_chfam) - h.execute(name="Private Channel Family 1", \ - label="private-channel-family-1", \ - org=1, url="First Org Created") - + try: + h.execute(name='Private Channel Family 1', \ + label='private-channel-family-1', \ + org=1, url='First Org Created') + except rhnSQL.SQLError, e: + # if we're here that means we're voilating something + raise e + if __name__ == '__main__': from common import initCFG, CFG

1 0

Branch 'VADER' - backend/common
by Pradeep Kilambi 02 Apr '09

02 Apr '09

backend/common/rhn_rpm.py | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) New commits: commit ecc841f571f452c8178ed355c3790984f5d86cf9 Author: Pradeep Kilambi <pkilambi(a)redhat.com> Date: Thu Apr 2 15:50:02 2009 -0400 493583 - fixing the rhnpush to call old rpm libraries for RHEL-4 diff --git a/backend/common/rhn_rpm.py b/backend/common/rhn_rpm.py index 93b87d5..3b622e6 100644 --- a/backend/common/rhn_rpm.py +++ b/backend/common/rhn_rpm.py @@ -268,10 +268,19 @@ def get_package_header(filename=None, file=None, fd=None): if hdr is None: raise InvalidPackageError else: - header_start, header_end = \ - get_header_byte_range(os.fdopen(os.dup(file_desc))) - os.lseek(file_desc, header_start, 0) - hdr, offset = rpm.readHeaderFromFD(file_desc) + try: + header_start, header_end = \ + get_header_byte_range(os.fdopen(os.dup(file_desc))) + os.lseek(file_desc, header_start, 0) + hdr, offset = rpm.readHeaderFromFD(file_desc) + except AttributeError: + # RHEL-4 and older, do the old way + ts = RPMReadOnlyTransaction() + nomd5 = getattr(rpm, 'RPMVSF_NOMD5') + needpayload = getattr(rpm, 'RPMVSF_NEEDPAYLOAD') + ts.pushVSFlags(~(nomd5 | needpayload)) + hdr = RPMReadOnlyTransaction().hdrFromFdno(file_desc) + ts.popVSFlags() if hdr is None: raise InvalidPackageError is_source = hdr[getattr(rpm, 'RPMTAG_SOURCEPACKAGE')]

1 0

Changes to 'vader'
by Pradeep Kilambi 02 Apr '09

02 Apr '09

New branch 'vader' available with the following commits: commit ecc841f571f452c8178ed355c3790984f5d86cf9 Author: Pradeep Kilambi <pkilambi(a)redhat.com> Date: Thu Apr 2 15:50:02 2009 -0400 493583 - fixing the rhnpush to call old rpm libraries for RHEL-4

1 0

Changes to 'refs/tags/spacewalk-java-0.6.1-1'
by Devan Goodwin 02 Apr '09

02 Apr '09

Tag 'spacewalk-java-0.6.1-1' created by Devan Goodwin <dgoodwin(a)redhat.com> at 2009-04-02 19:37 +0000 Tagging package [spacewalk-java] version [0.6.1-1] in directory [java/]. Changes since rhnpush-0.4.7-1-30: --- 0 files changed ---

1 0

2 commits - java/spacewalk-java.spec rel-eng/packages
by Devan Goodwin 02 Apr '09

02 Apr '09

java/spacewalk-java.spec | 30 ++++++++++++++++++++++++++++-- rel-eng/packages/spacewalk-java | 2 +- 2 files changed, 29 insertions(+), 3 deletions(-) New commits: commit 48da4bf1d964484ecdb1b92ba0280eef7006596b Author: Devan Goodwin <dgoodwin(a)redhat.com> Date: Thu Apr 2 16:37:24 2009 -0300 Automatic commit of package [spacewalk-java] release [0.6.1-1]. diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index f58ac8f..24b895b 100644 --- a/java/spacewalk-java.spec +++ b/java/spacewalk-java.spec @@ -10,7 +10,7 @@ Name: spacewalk-java Summary: Spacewalk Java site packages Group: Applications/Internet License: GPLv2 -Version: 0.6.0 +Version: 0.6.1 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -235,6 +235,32 @@ fi %attr(644, root, root) %{_datadir}/rhn/lib/rhn.jar %changelog +* Thu Apr 02 2009 Devan Goodwin <dgoodwin(a)redhat.com> 0.6.1-1 +- 481130 - Move preun scriptlet to taskomatic subpackage. (dgoodwin(a)redhat.com) +- 487393 - fixed issue where list count was wrong on provisioning page + (jsherril(a)redhat.com) +- 493111 - api - errata.delete added & fixed add/removePackages & setDetails to + only modify custom errata (bbuckingham(a)redhat.com) +- 493421 - api - kickstart.tree.deleteTreeAndProfiles fixed to delete + associated profiles (bbuckingham(a)redhat.com) +- 487688 - adding text during ks tree creation to explain more detail of what + is needed (jsherril(a)redhat.com) +- 462593 - fixing issue where creating or renaming a profile with a name that + already exists would give ISE (jsherril(a)redhat.com) +- 492903 - api - channel.software.create - updates so that new channels will + show on Channel tab (bbuckingham(a)redhat.com) +- 492980 - api - errata.getDetails - add release, product and solution to + return and clarify last_modified_date in docs (bbuckingham(a)redhat.com) +- 458838 - adding new files for kickstart exception 404 (jsherril(a)redhat.com) +- 490987 - fixed issue where errata files werent being refreshed, by removing + the need for errata files (jsherril(a)redhat.com) +- 458838 - changing kickstart download 404s to have a descriptive message + (jsherril(a)redhat.com) +- removed jasper5* from run time dependencies and made them build time + instead. (paji(a)redhat.com) +- 489532 - unsubscribe multiorg shared channel when moving access from public + to protected with deny selection (shughes(a)redhat.com) + * Mon Mar 30 2009 Mike McCune <mmccune(a)gmail.com> 0.5.44-1 - 472595 - ported query forgot to check child channels - 144325 - converting system probe list to the new list tag, featuring all the bells and diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java index 219ea59..1b529b2 100644 --- a/rel-eng/packages/spacewalk-java +++ b/rel-eng/packages/spacewalk-java @@ -1 +1 @@ -0.5.44-1 java/ +0.6.1-1 java/ commit 034a6ceba696aadb7fc1d182401b30c851b26d5a Author: Devan Goodwin <dgoodwin(a)redhat.com> Date: Thu Apr 2 15:56:26 2009 -0300 481130 - Move preun scriptlet to taskomatic subpackage. Was causing error when removing spacewalk-java, as taskomatic was no longer was installed. Judging by the post scriptlet above, it looks like this belongs with taskomatic, not java. diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index 66a6135..f58ac8f 100644 --- a/java/spacewalk-java.spec +++ b/java/spacewalk-java.spec @@ -204,7 +204,7 @@ rm -rf $RPM_BUILD_ROOT # This adds the proper /etc/rc*.d links for the script /sbin/chkconfig --add taskomatic -%preun +%preun -n spacewalk-taskomatic if [ $1 = 0 ] ; then /sbin/service taskomatic stop >/dev/null 2>&1 /sbin/chkconfig --del taskomatic

1 0

← Newer
1
...
66
67
68
69
70
71
72
...
75
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

spacewalk-commits April 2009