spacewalk-commits October 2009

spacewalk-commits@lists.fedorahosted.org

7 participants
136 discussions

2 commits - java/code java/spacewalk-java.spec rel-eng/packages
by Miroslav Suchý 23 Oct '09

23 Oct '09

java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml | 3 - java/code/src/com/redhat/rhn/domain/server/InstalledPackage.hbm.xml | 1 java/code/src/com/redhat/rhn/domain/server/InstalledPackage.java | 19 ++++++++ java/code/src/com/redhat/rhn/frontend/dto/PackageListItem.java | 22 ++++++++++ java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 14 +++++- java/code/webapp/WEB-INF/pages/systems/details/packages/packagelist.jsp | 11 ++++- java/spacewalk-java.spec | 7 ++- rel-eng/packages/spacewalk-java | 2 8 files changed, 72 insertions(+), 7 deletions(-) New commits: commit fa207f4c916c2350f93b26cfbfdd66b4b39dc4cb Author: Miroslav Suchý <msuchy(a)redhat.com> Date: Fri Oct 23 16:47:16 2009 +0200 Automatic commit of package [spacewalk-java] release [0.7.10-1]. diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index 03bdecd..8d93d5d 100644 --- a/java/spacewalk-java.spec +++ b/java/spacewalk-java.spec @@ -12,7 +12,7 @@ Name: spacewalk-java Summary: Spacewalk Java site packages Group: Applications/Internet License: GPLv2 -Version: 0.7.9 +Version: 0.7.10 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -280,6 +280,11 @@ fi %{jardir}/postgresql-jdbc.jar %changelog +* Fri Oct 23 2009 Miroslav Suchý <msuchy(a)redhat.com> 0.7.10-1 +- 449167 - show rpm install date in webui +- 144325 - recommiting this without the unintended sql commit <jsherril(a)redhat.com> +- 144325 - moving probes and probe suite pages over to new list tag <jsherril(a)redhat.com> + * Tue Oct 20 2009 Miroslav Suchý <msuchy(a)redhat.com> 0.7.9-1 - Make spacewalk use the editarea RPM and remove supplied editarea files (colin.coe(a)gmail.com) diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java index d6695a9..827cab6 100644 --- a/rel-eng/packages/spacewalk-java +++ b/rel-eng/packages/spacewalk-java @@ -1 +1 @@ -0.7.9-1 java/ +0.7.10-1 java/ commit 9168658016c29aa56f53f61017980c7a6b3a6b8b Author: Miroslav Suchý <msuchy(a)redhat.com> Date: Fri Oct 23 16:43:49 2009 +0200 449167 - show rpm install date in webui diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml index af14eb6..2820e0b 100644 --- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml +++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml @@ -395,7 +395,8 @@ SELECT PN.id || '|' || PE.id || '|' || PA.id AS ID_COMBO, PE.epoch, PN.id AS NAME_ID, PE.id AS EVR_ID, - PA.label as arch + PA.label as arch, + SP.installtime as installTime FROM rhnPackageName PN INNER JOIN rhnServerPackage SP on SP.name_id = PN.id INNER JOIN rhnPackageEVR PE on SP.evr_id = PE.id diff --git a/java/code/src/com/redhat/rhn/domain/server/InstalledPackage.hbm.xml b/java/code/src/com/redhat/rhn/domain/server/InstalledPackage.hbm.xml index 54ddc5a..1609031 100644 --- a/java/code/src/com/redhat/rhn/domain/server/InstalledPackage.hbm.xml +++ b/java/code/src/com/redhat/rhn/domain/server/InstalledPackage.hbm.xml @@ -19,6 +19,7 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" class="com.redhat.rhn.domain.rhnpackage.PackageName" column="name_id" /> </composite-id> + <property name="installTime" column="installtime" type="timestamp" /> <many-to-one name="arch" class="com.redhat.rhn.domain.rhnpackage.PackageArch" column="package_arch_id" /> diff --git a/java/code/src/com/redhat/rhn/domain/server/InstalledPackage.java b/java/code/src/com/redhat/rhn/domain/server/InstalledPackage.java index 8f0ff4d..46eaedb 100644 --- a/java/code/src/com/redhat/rhn/domain/server/InstalledPackage.java +++ b/java/code/src/com/redhat/rhn/domain/server/InstalledPackage.java @@ -23,6 +23,7 @@ import org.apache.commons.lang.builder.EqualsBuilder; import org.apache.commons.lang.builder.HashCodeBuilder; import java.io.Serializable; +import java.util.Date; /** * @@ -45,7 +46,7 @@ public class InstalledPackage implements Serializable, Comparable<InstalledPacka private PackageName name; private PackageArch arch; private Server server; - + private Date installTime; /** * @return Returns the server. @@ -103,6 +104,22 @@ public class InstalledPackage implements Serializable, Comparable<InstalledPacka public void setName(PackageName nameIn) { this.name = nameIn; } + + /** + * Getter for installTime + * @return Date when package was installed (as reported by rpm database). + */ + public Date getInstallTime() { + return this.installTime; + } + + /** + * Setter for installTime + * @param installTimeIn to set + */ + public void setInstallTime(Date installTimeIn) { + this.installTime = installTimeIn; + } /** * diff --git a/java/code/src/com/redhat/rhn/frontend/dto/PackageListItem.java b/java/code/src/com/redhat/rhn/frontend/dto/PackageListItem.java index d3341fc..226c416 100644 --- a/java/code/src/com/redhat/rhn/frontend/dto/PackageListItem.java +++ b/java/code/src/com/redhat/rhn/frontend/dto/PackageListItem.java @@ -19,6 +19,7 @@ import com.redhat.rhn.common.localization.LocalizationService; import org.apache.commons.lang.builder.ToStringBuilder; import java.util.ArrayList; +import java.util.Date; import java.util.HashMap; import java.util.LinkedList; import java.util.List; @@ -53,6 +54,7 @@ public class PackageListItem extends IdComboDto { private String evra; private String summary; private String nvrea; + private Date installTime; private Long idOne; private Long idTwo; @@ -406,6 +408,26 @@ public class PackageListItem extends IdComboDto { public void setNvrea(String aNvrea) { this.nvrea = aNvrea; } + + /** + * Getter for installTime + * @return String when package was installed (as reported by rpm database). + */ + public String getInstallTime() { + if (installTime == null) { + return ""; + } + return LocalizationService.getInstance().formatDate(installTime); + } + + /** + * Setter for installTime + * @param installTimeIn to set + */ + public void setInstalltime(Date installTimeIn) { + installTime = installTimeIn; + } + /** * Get a string representation of NEVR: * diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml index 279a9dc..221f448 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml @@ -3094,7 +3094,19 @@ button below, and <b>will be unable to log back in</b>.</source> <context context-type="sourcefile">/rhn/systems/details/packages/RemoveConfirm.do</context> <context context-type="sourcefile">/rhn/errata/manage/AddPackagesConfirm.do</context> </context-group> - </trans-unit> + </trans-unit> + <trans-unit id="packagelist.jsp.installtime"> +<source>Installed</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/systems/details/packages/PackageList.do</context> + </context-group> + </trans-unit> + <trans-unit id="packagelist.jsp.unknowntime"> +<source>N/A</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/systems/details/packages/PackageList.do</context> + </context-group> + </trans-unit> <trans-unit id="packagelist.jsp.removepagesummary"> <source>The following packages are installed on this system. Packages may be scheduled for removal by selecting them and clicking "Remove Packages" below.</source> <context-group name="ctx"> diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/packagelist.jsp b/java/code/webapp/WEB-INF/pages/systems/details/packages/packagelist.jsp index bb67609..71c525f 100644 --- a/java/code/webapp/WEB-INF/pages/systems/details/packages/packagelist.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/packagelist.jsp @@ -56,12 +56,19 @@ <a href="/rhn/software/packages/Details.do?sid=${param.sid}&id_combo=${current.idCombo}"> ${current.nvre}</a> </rl:column> - <rl:column headerkey="packagelist.jsp.packagearch" bound="false" styleclass="thin-column last-column"> + <rl:column headerkey="packagelist.jsp.packagearch" bound="false" styleclass="thin-column"> <c:choose> <c:when test ="${not empty current.arch}">${current.arch}</c:when> <c:otherwise><bean:message key="packagelist.jsp.notspecified"/></c:otherwise> </c:choose> - </rl:column> + </rl:column> + <rl:column headerkey="packagelist.jsp.installtime" bound="false" styleclass="last-column" + sortattr="installTime" sortable="true"> + <c:choose> + <c:when test ="${not empty current.installTime}">${current.installTime}</c:when> + <c:otherwise><bean:message key="packagelist.jsp.notspecified"/></c:otherwise> + </c:choose> + </rl:column> </rl:list> <c:if test="${not empty requestScope.all}">

1 0

client/tools
by Milan Zazrivec 23 Oct '09

23 Oct '09

client/tools/spacewalk-koan/spacewalkkoan/spacewalkkoan.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 669e6f7d7da15bcfd03d8159af26201eef28bca4 Author: Milan Zazrivec <mzazrivec(a)redhat.com> Date: Fri Oct 23 16:33:18 2009 +0200 530553 - wait for virt. domain installation to finish and restart Wait for virtual guest (Xen / KVM) installation to finish and create the domain again after the installation is over. This will cause initiate_guest() to block for the whole installation, nonetheless we will be consistent with rhn-kickstart (pre cobbler era) behavior. diff --git a/client/tools/spacewalk-koan/spacewalkkoan/spacewalkkoan.py b/client/tools/spacewalk-koan/spacewalkkoan/spacewalkkoan.py index f8a143c..edcb7d6 100644 --- a/client/tools/spacewalk-koan/spacewalkkoan/spacewalkkoan.py +++ b/client/tools/spacewalk-koan/spacewalkkoan/spacewalkkoan.py @@ -178,7 +178,7 @@ def initiate_guest(kickstart_host, cobbler_system_name, virt_type, name, mem_kb, k.port = 443 k.profile = None k.system = cobbler_system_name - k.should_poll = 0 + k.should_poll = 1 k.image = None k.live_cd = None k.virt_name = name

1 0

client/tools
by Milan Zazrivec 23 Oct '09

23 Oct '09

client/tools/rhn-virtualization/virtualization/domain_directory.py | 36 ++++++++++ 1 file changed, 36 insertions(+) New commits: commit 987e596c172fd24d8535d3d4919f40b485ba6484 Author: Milan Zazrivec <mzazrivec(a)redhat.com> Date: Fri Oct 23 14:24:35 2009 +0200 return back pieces still used by rhn-kickstart Parts of python code returned back with this commit were removed in commit 309403ad69b27b46c8419d221811219606dc99a6 as a part of fixes for bug #510606. These parts are still in fact used by client-side package rhn-kickstart (mechanism used in pre cobbler era). diff --git a/client/tools/rhn-virtualization/virtualization/domain_directory.py b/client/tools/rhn-virtualization/virtualization/domain_directory.py index 18121a6..ba069f4 100644 --- a/client/tools/rhn-virtualization/virtualization/domain_directory.py +++ b/client/tools/rhn-virtualization/virtualization/domain_directory.py @@ -35,6 +35,29 @@ from virtualization.util import dehyphenize_uuid, \ ############################################################################### CONFIG_DIR = '/etc/sysconfig/rhn/virt' +STANDARD_CONFIG_TEMPLATE = """ + <domain type='xen'> + <name>%(name)s</name> + <bootloader>/usr/bin/pygrub</bootloader> + <memory>%(mem_kb)s</memory> + <vcpu>%(vcpus)s</vcpu> + <uuid>%(uuid)s</uuid> + <on_reboot>restart</on_reboot> + <on_poweroff>destroy</on_poweroff> + <on_crash>preserve</on_crash> + <devices> + <disk type='file'> + <source file='%(disk)s'/> + <target dev='xvda'/> + </disk> + <interface type='bridge'> + <source bridge='xenbr0'/> + <mac address='%(mac)s'/> + <script path='/etc/xen/scripts/vif-bridge'/> + </interface> + </devices> +</domain> +""" ############################################################################### # Classes @@ -68,6 +91,19 @@ class DomainDirectory: """ return DomainConfig(self.__path, uuid) + def create_standard_config(self, uuid, name, mem_kb, vcpus, disk, mac): + # First, populate the XML with the appropriate values. + boot_params = { 'name' : name, + 'mem_kb' : mem_kb, + 'vcpus' : vcpus, + 'uuid' : hyphenize_uuid(uuid), + 'disk' : disk, + 'mac' : mac } + + xml = STANDARD_CONFIG_TEMPLATE % boot_params + + self.__write_xml_file(uuid, xml) + def save_unknown_domain_configs(self, domain_uuids): """ This function saves the configuration for any domains whose UUIDs are

1 0

Changes to 'refs/tags/spacewalk-backend-0.7.9-1'
by Jan Pazdziora 23 Oct '09

23 Oct '09

Tag 'spacewalk-backend-0.7.9-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2009-10-23 11:34 +0000 Tagging package [spacewalk-backend] version [0.7.9-1] in directory [backend/]. Changes since rhn-client-tools-0.7.7-1: Jan Pazdziora (5): reporting: new report errata-list, listing erratas applicable to systems. reporting: errata-list: as the severity_id seems to always be null, removing the severity column from output. reporting: new report errata-systems, listing systems for each errata. reporting: as errata-system report does not have any multival_columns, we need to disable the multival logic in that case. Automatic commit of package [spacewalk-backend] release [0.7.9-1]. Miroslav Suchý (1): Dont halt registration if the hardware info could not be acquired for rhnreg_ks. --- backend/satellite_tools/reports/data/errata-list | 28 +++++++++++++ backend/satellite_tools/reports/data/errata-systems | 30 ++++++++++++++ backend/satellite_tools/spacewalk-report | 2 backend/spacewalk-backend.spec | 5 +- client/rhel/rhn-client-tools/src/up2date_client/rhnreg.py | 5 +- rel-eng/packages/spacewalk-backend | 2 6 files changed, 68 insertions(+), 4 deletions(-) ---

1 0

backend/spacewalk-backend.spec rel-eng/packages
by Jan Pazdziora 23 Oct '09

23 Oct '09

backend/spacewalk-backend.spec | 5 ++++- rel-eng/packages/spacewalk-backend | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) New commits: commit 8a27e68473ba18800e7e4a8ab04041ba0650e2be Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Fri Oct 23 13:34:14 2009 +0200 Automatic commit of package [spacewalk-backend] release [0.7.9-1]. diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec index 299e6fa..12a55a7 100644 --- a/backend/spacewalk-backend.spec +++ b/backend/spacewalk-backend.spec @@ -7,7 +7,7 @@ Name: spacewalk-backend Summary: Common programs needed to be installed on the Spacewalk servers/proxies Group: Applications/Internet License: GPLv2 -Version: 0.7.8 +Version: 0.7.9 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -582,6 +582,9 @@ rm -f %{rhnconf}/rhnSecret.py* # $Id$ %changelog +* Fri Oct 23 2009 Jan Pazdziora 0.7.9-1 +- reporting: added report errata-list and errata-system + * Thu Oct 22 2009 Miroslav Suchy <msuchy(a)redhat.com> 0.7.8-1 - 449167 - record installation date of rpm package diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend index d8633b2..3892c7f 100644 --- a/rel-eng/packages/spacewalk-backend +++ b/rel-eng/packages/spacewalk-backend @@ -1 +1 @@ -0.7.8-1 backend/ +0.7.9-1 backend/

1 0

4 commits - backend/satellite_tools
by Jan Pazdziora 23 Oct '09

23 Oct '09

backend/satellite_tools/reports/data/errata-list | 28 ++++++++++++++++++ backend/satellite_tools/reports/data/errata-systems | 30 ++++++++++++++++++++ backend/satellite_tools/spacewalk-report | 2 - 3 files changed, 59 insertions(+), 1 deletion(-) New commits: commit 1a7477c0e2b984b0743cdca9896f53e74f67b535 Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Fri Oct 23 13:29:49 2009 +0200 reporting: as errata-system report does not have any multival_columns, we need to disable the multival logic in that case. diff --git a/backend/satellite_tools/spacewalk-report b/backend/satellite_tools/spacewalk-report index eb80584..af81457 100755 --- a/backend/satellite_tools/spacewalk-report +++ b/backend/satellite_tools/spacewalk-report @@ -124,7 +124,7 @@ if __name__ == '__main__': outrow = None multival_dupes = {} while row != None: - if options.multivalonrows: + if options.multivalonrows or not report.multival_column_names.keys(): writer.writerow(row) row = h.fetchone() continue commit e05cda398c8997da84884307db1cfa62e64a98cd Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Fri Oct 23 13:28:36 2009 +0200 reporting: new report errata-systems, listing systems for each errata. diff --git a/backend/satellite_tools/reports/data/errata-systems b/backend/satellite_tools/reports/data/errata-systems new file mode 100755 index 0000000..85079d3 --- /dev/null +++ b/backend/satellite_tools/reports/data/errata-systems @@ -0,0 +1,30 @@ + +columns: + + advisory + server_id + profile_name + hostname + ip_address + +sql: + + select rhnErrata.advisory_name as advisory, + rhnServerNeededErrataCache.server_id, + rhnServer.name as profile_name, + rhnservernetwork.hostname, trim(rhnservernetwork.ipaddr) as ip_address + from rhnErrata, rhnServerNeededErrataCache, rhnServer, + ( + select server_id, hostname, ipaddr + from rhnservernetwork + where id in ( + select min(id) + from rhnservernetwork + group by server_id + ) + ) rhnservernetwork + where rhnErrata.id = rhnServerNeededErrataCache.errata_id + and rhnServerNeededErrataCache.server_id = rhnServer.id + and rhnServerNeededErrataCache.server_id = rhnservernetwork.server_id (+) + order by rhnErrata.advisory_name, rhnServerNeededErrataCache.server_id + commit bfac445773847e2132cb41b832d5f75adc2250c7 Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Fri Oct 23 11:53:55 2009 +0200 reporting: errata-list: as the severity_id seems to always be null, removing the severity column from output. diff --git a/backend/satellite_tools/reports/data/errata-list b/backend/satellite_tools/reports/data/errata-list index 58f6abe..f76a918 100755 --- a/backend/satellite_tools/reports/data/errata-list +++ b/backend/satellite_tools/reports/data/errata-list @@ -3,7 +3,6 @@ columns: advisory cve - severity synopsis systems_affected @@ -16,17 +15,14 @@ sql: select rhnErrata.advisory_name as advisory, rhnCVE.name as cve, - rhnErrataSeverity.label as severity, rhnErrata.synopsis, count(*) as systems_affected - from rhnErrata, rhnServerNeededErrataCache, rhnErrataCVE, rhnCVE, rhnErrataSeverity + from rhnErrata, rhnServerNeededErrataCache, rhnErrataCVE, rhnCVE where rhnErrata.id = rhnServerNeededErrataCache.errata_id and rhnErrata.id = rhnErrataCVE.errata_id (+) and rhnErrataCVE.cve_id = rhnCVE.id (+) - and rhnErrata.severity_id = rhnErrataSeverity.id (+) group by rhnErrata.id, rhnErrata.advisory_name, rhnCVE.name, - rhnErrataSeverity.label, rhnErrata.synopsis order by rhnErrata.advisory_name, rhnCVE.name commit f6ad8fe19d1ef742a6adcda4ddba3cd0ab22c1f3 Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Fri Oct 23 11:52:39 2009 +0200 reporting: new report errata-list, listing erratas applicable to systems. diff --git a/backend/satellite_tools/reports/data/errata-list b/backend/satellite_tools/reports/data/errata-list new file mode 100755 index 0000000..58f6abe --- /dev/null +++ b/backend/satellite_tools/reports/data/errata-list @@ -0,0 +1,32 @@ + +columns: + + advisory + cve + severity + synopsis + systems_affected + +multival_columns: + + advisory + cve : cve + +sql: + + select rhnErrata.advisory_name as advisory, + rhnCVE.name as cve, + rhnErrataSeverity.label as severity, + rhnErrata.synopsis, + count(*) as systems_affected + from rhnErrata, rhnServerNeededErrataCache, rhnErrataCVE, rhnCVE, rhnErrataSeverity + where rhnErrata.id = rhnServerNeededErrataCache.errata_id + and rhnErrata.id = rhnErrataCVE.errata_id (+) + and rhnErrataCVE.cve_id = rhnCVE.id (+) + and rhnErrata.severity_id = rhnErrataSeverity.id (+) + group by rhnErrata.id, + rhnErrata.advisory_name, + rhnCVE.name, + rhnErrataSeverity.label, + rhnErrata.synopsis + order by rhnErrata.advisory_name, rhnCVE.name

1 0

client/rhel
by Miroslav Suchý 23 Oct '09

23 Oct '09

client/rhel/rhn-client-tools/src/up2date_client/rhnreg.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) New commits: commit a41949c08b7d72e691b4aba46bf7faa864e6255d Author: Miroslav Suchý <msuchy(a)redhat.com> Date: Fri Oct 23 12:08:08 2009 +0200 Dont halt registration if the hardware info could not be acquired for rhnreg_ks. Merging code from svn (rev. 186347) diff --git a/client/rhel/rhn-client-tools/src/up2date_client/rhnreg.py b/client/rhel/rhn-client-tools/src/up2date_client/rhnreg.py index 34bf3c2..ffba657 100644 --- a/client/rhel/rhn-client-tools/src/up2date_client/rhnreg.py +++ b/client/rhel/rhn-client-tools/src/up2date_client/rhnreg.py @@ -426,7 +426,10 @@ def registerSystem(username = None, password = None, auth_dict["password"] = password if cfg['supportsSMBIOS']: - auth_dict["smbios"] = hardware.get_hal_smbios() + try: + auth_dict["smbios"] = hardware.get_hal_smbios() + except: + log.log_debug("Cannot Acquire hardware information") s = rhnserver.RhnServer() if packages == None:

1 0

Changes to 'refs/tags/rhn-client-tools-0.7.7-1'
by Miroslav Suchý 23 Oct '09

23 Oct '09

Tag 'rhn-client-tools-0.7.7-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2009-10-23 09:41 +0000 Tagging package [rhn-client-tools] version [0.7.7-1] in directory [client/rhel/rhn-client-tools/]. Changes since rhn-client-tools-0.7.6-1: Miroslav Suchý (2): 530369 - we could not modify dictionary during loop Automatic commit of package [rhn-client-tools] release [0.7.7-1]. --- client/rhel/rhn-client-tools/rhn-client-tools.spec | 4 ++-- client/rhel/rhn-client-tools/src/up2date_client/rpmUtils.py | 4 ++-- rel-eng/packages/rhn-client-tools | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) ---

1 0

2 commits - client/rhel rel-eng/packages
by Miroslav Suchý 23 Oct '09

23 Oct '09

client/rhel/rhn-client-tools/rhn-client-tools.spec | 4 ++-- client/rhel/rhn-client-tools/src/up2date_client/rpmUtils.py | 4 ++-- rel-eng/packages/rhn-client-tools | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) New commits: commit fd7120c8826b23bba82e07a8de1e8e57c22bd9c2 Author: Miroslav Suchý <msuchy(a)redhat.com> Date: Fri Oct 23 11:41:35 2009 +0200 Automatic commit of package [rhn-client-tools] release [0.7.7-1]. diff --git a/client/rhel/rhn-client-tools/rhn-client-tools.spec b/client/rhel/rhn-client-tools/rhn-client-tools.spec index f5d1df6..008993d 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.7.6 +Version: 0.7.7 Release: 1%{?dist} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -215,7 +215,7 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/applications/rhn_register.desktop %changelog -* Fri Oct 23 2009 Miroslav Suchy <msuchy(a)redhat.com> 0.7.6-1 +* Fri Oct 23 2009 Miroslav Suchy <msuchy(a)redhat.com> 0.7.7-1 - 530369 - header is inmutable * Thu Oct 22 2009 Miroslav Suchy <msuchy(a)redhat.com> 0.7.5-1 diff --git a/rel-eng/packages/rhn-client-tools b/rel-eng/packages/rhn-client-tools index a5d7012..fb8d3ae 100644 --- a/rel-eng/packages/rhn-client-tools +++ b/rel-eng/packages/rhn-client-tools @@ -1 +1 @@ -0.7.6-1 client/rhel/rhn-client-tools/ +0.7.7-1 client/rhel/rhn-client-tools/ commit 7c61e972652dac63b404ed08712b90e70ef6d3ad Author: Miroslav Suchý <msuchy(a)redhat.com> Date: Fri Oct 23 11:35:46 2009 +0200 530369 - we could not modify dictionary during loop addressing: Traceback (most recent call last): File "/usr/sbin/rhn_check", line 276, in __run_action (status, message, data) = CheckCli.__do_call(method, params) File "/usr/sbin/rhn_check", line 269, in __do_call retval = method(*params) File "/usr/share/rhn/actions/packages.py", line 460, in verify ret, missing_packages = rpmUtils.verifyPackages(packages) File "/usr/share/rhn/up2date_client/rpmUtils.py", line 62, in verifyPackages for key, value in keywords.iteritems(): exceptions.RuntimeError: dictionary changed size during iteration diff --git a/client/rhel/rhn-client-tools/src/up2date_client/rpmUtils.py b/client/rhel/rhn-client-tools/src/up2date_client/rpmUtils.py index c4fc1a8..79de878 100644 --- a/client/rhel/rhn-client-tools/src/up2date_client/rpmUtils.py +++ b/client/rhel/rhn-client-tools/src/up2date_client/rpmUtils.py @@ -59,8 +59,8 @@ def verifyPackages(packages): # we left our epoch 'arch': package[4] } - for key, value in keywords.iteritems(): - if (value == None) or (value == ""): + for key in (keywords.keys()): + if (keywords[key] == None) or (keywords[key] == ""): del(keywords[key]) headers = installedHeaderByKeyword(**keywords)

1 0

Changes to 'refs/tags/rhn-client-tools-0.7.6-1'
by Miroslav Suchý 23 Oct '09

23 Oct '09

Tag 'rhn-client-tools-0.7.6-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2009-10-23 09:25 +0000 Tagging package [rhn-client-tools] version [0.7.6-1] in directory [client/rhel/rhn-client-tools/]. Changes since rhn-client-tools-0.7.5-1: Jan Pazdziora (1): reporting: no need to use view which joins back to rhnErrata. Milan Zazrivec (1): 529688 - correctly update virtualization profile for KVM guest Miroslav Suchý (2): 530369 - header is inmutable Automatic commit of package [rhn-client-tools] release [0.7.6-1]. --- backend/satellite_tools/reports/data/inventory | 2 - client/rhel/rhn-client-tools/rhn-client-tools.spec | 5 +++- client/rhel/rhn-client-tools/src/up2date_client/rpmUtils.py | 14 ++++++------ client/tools/rhn-virtualization/virtualization/support.py | 7 +++--- rel-eng/packages/rhn-client-tools | 2 - 5 files changed, 18 insertions(+), 12 deletions(-) ---

1 0

← Newer
1
2
3
4
5
6
7
8
...
14
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

spacewalk-commits October 2009