From tkasparek at fedoraproject.org Thu Aug 20 12:13:30 2015 Content-Type: multipart/mixed; boundary="===============7872672168645401014==" MIME-Version: 1.0 From: =?utf-8?q?Tom=C3=A1=C5=A1_Ka=C5=A1p=C3=A1rek_=3Ctkasparek_at_fedoraprojec?= =?utf-8?q?t=2Eorg=3E?= To: spacewalk-commits at lists.fedorahosted.org Subject: java/code Date: Mon, 03 Dec 2012 10:41:45 +0000 Message-ID: <20121203104145.BBA14A0C5D@fedorahosted.org> --===============7872672168645401014== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/domain/action/test/ActionFormatterTest.java |= 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit bfbbf3dbd90bd51a3c86dec6e91dc43b6bfaed5a Author: Tomas Kasparek Date: Thu Nov 29 13:46:56 2012 +0100 ActionFormatterTest should no more fail at testErrataFormatter = added one
tag so suffix of tested errata and string which is test= against should match diff --git a/java/code/src/com/redhat/rhn/domain/action/test/ActionFormatte= rTest.java b/java/code/src/com/redhat/rhn/domain/action/test/ActionFormatte= rTest.java index 1c29c53..79efc32 100644 --- a/java/code/src/com/redhat/rhn/domain/action/test/ActionFormatterTest.j= ava +++ b/java/code/src/com/redhat/rhn/domain/action/test/ActionFormatterTest.j= ava @@ -94,7 +94,7 @@ public class ActionFormatterTest extends RhnBaseTestCase { String start =3D "

Test synopsis
" + "
" + ErrataFactory.ERRATA_TYPE_BUG + - "

test topic
Test desc ..
"; + "

test topic
Test desc ..

"; assertTrue(af.getNotes().startsWith(start)); assertTrue(af.getNotes().endsWith(end)); } --===============7872672168645401014==-- From tkasparek at fedoraproject.org Thu Aug 20 12:13:31 2015 Content-Type: multipart/mixed; boundary="===============6126500369587571981==" MIME-Version: 1.0 From: =?utf-8?q?Tom=C3=A1=C5=A1_Ka=C5=A1p=C3=A1rek_=3Ctkasparek_at_fedoraprojec?= =?utf-8?q?t=2Eorg=3E?= To: spacewalk-commits at lists.fedorahosted.org Subject: java/code Date: Mon, 03 Dec 2012 12:37:44 +0000 Message-ID: <20121203123744.1FE9EA0C5D@fedorahosted.org> --===============6126500369587571981== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/domain/rhnpackage/test/PackageTest.java | = 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit b28e9edc4e44243c4ebc94aec0692a043fe37c41 Author: Tomas Kasparek Date: Mon Dec 3 13:26:29 2012 +0100 PackageHelperTest should no more fail at testPackageToMap = Error was occuring when checking "last_modified_date" so at package cre= ation setLastModified method is used instead of setModified. diff --git a/java/code/src/com/redhat/rhn/domain/rhnpackage/test/PackageTes= t.java b/java/code/src/com/redhat/rhn/domain/rhnpackage/test/PackageTest.ja= va index b46c60e..e6aa66e 100644 --- a/java/code/src/com/redhat/rhn/domain/rhnpackage/test/PackageTest.java +++ b/java/code/src/com/redhat/rhn/domain/rhnpackage/test/PackageTest.java @@ -131,7 +131,7 @@ public class PackageTest extends RhnBaseTestCase { p.setCopyright("Red Hat - RHN - 2005"); p.setCookie("Chocolate Chip"); p.setCreated(new Date()); - p.setModified(new Date()); + p.setLastModified(new Date()); = p.setOrg(org); p.setPackageName(pname); --===============6126500369587571981==-- From tlestach at fedoraproject.org Thu Aug 20 12:13:31 2015 Content-Type: multipart/mixed; boundary="===============3344710935153657922==" MIME-Version: 1.0 From: Tomas Lestach To: spacewalk-commits at lists.fedorahosted.org Subject: java/code Date: Mon, 03 Dec 2012 13:22:05 +0000 Message-ID: <20121203132205.B79D0A0C5D@fedorahosted.org> --===============3344710935153657922== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/domain/kickstart/KickstartFactory.java = | 2 ++ java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfileEditC= ommand.java | 8 ++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) New commits: commit f8559ee73b52ba4959828459b8c68ed10ef27b2e Author: Tomas Lestach Date: Mon Dec 3 14:20:49 2012 +0100 881830 - create /var/lib/rhn/kickstarts/wizard/*.cfg files if missing b= y the KickstartFileSyncTask = also fix the query returning all kickstart data to contain only unique = entries diff --git a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartFactory= .java b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartFactory.java index 41171d5..3a82dc2 100644 --- a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartFactory.java +++ b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartFactory.java @@ -879,6 +879,8 @@ public class KickstartFactory extends HibernateFactory { public static List listAllKickstartData() { Session session =3D getSession(); Criteria c =3D session.createCriteria(KickstartData.class); + // Hibernate does not filter out duplicate references by default + c.setResultTransformer(Criteria.DISTINCT_ROOT_ENTITY); return c.list(); } = diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/Cobbler= ProfileEditCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/co= bbler/CobblerProfileEditCommand.java index 9ebd6aa..1310fc0 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfile= EditCommand.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfile= EditCommand.java @@ -22,6 +22,8 @@ import com.redhat.rhn.domain.user.User; import org.apache.commons.lang.StringUtils; import org.cobbler.Profile; = +import java.io.File; + /** * KickstartCobblerCommand - class to contain logic to communicate with co= bbler * @version $Rev$ @@ -59,8 +61,10 @@ public class CobblerProfileEditCommand extends CobblerPr= ofileCommand { = if (prof !=3D null) { String cobName =3D makeCobblerName(ksData); + String cobFileName =3D ksData.buildCobblerFileName(); if (!cobName.equals(prof.getName()) || - !ksData.buildCobblerFileName().equals(ksData.getCobble= rFileName())) { + !cobFileName.equals(ksData.getCobblerFileName()) || + !(new File(cobFileName)).exists()) { // delete current cfg file KickstartFactory.removeKickstartTemplatePath(ksData); // create new cfg file @@ -68,7 +72,7 @@ public class CobblerProfileEditCommand extends CobblerPro= fileCommand { // change ks profile name prof.setName(cobName); // change ks profile cfg path - prof.setKickstart(this.ksData.buildCobblerFileName()); + prof.setKickstart(cobFileName); } updateCobblerFields(prof); } --===============3344710935153657922==-- From tkasparek at fedoraproject.org Thu Aug 20 12:13:31 2015 Content-Type: multipart/mixed; boundary="===============0247675634767001651==" MIME-Version: 1.0 From: =?utf-8?q?Tom=C3=A1=C5=A1_Ka=C5=A1p=C3=A1rek_=3Ctkasparek_at_fedoraprojec?= =?utf-8?q?t=2Eorg=3E?= To: spacewalk-commits at lists.fedorahosted.org Subject: java/code Date: Mon, 03 Dec 2012 14:34:20 +0000 Message-ID: <20121203143420.8F96AA0D90@fedorahosted.org> --===============0247675634767001651== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartDataTest.java = | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit 9a5c77d082b4c7eeb1d36fc4e1cdd40dcc3000ae Author: Tomas Kasparek Date: Mon Dec 3 14:10:11 2012 +0100 KickstartDataTest should no longer fail = Failing tests were caused by 1c7490e39d859179573e2c735e82bc3acb8e3f05, = using buildCobblerFileName instead of getCobblerFileName where getCobblerFi= leName would return null. diff --git a/java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartDa= taTest.java b/java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartD= ataTest.java index 178288a..66755a7 100644 --- a/java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartDataTest.= java +++ b/java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartDataTest.= java @@ -121,7 +121,7 @@ public class KickstartDataTest extends BaseTestCaseWith= User { org.cobbler.Profile p =3D org.cobbler.Profile.create( CobblerXMLRPCHelper.getConnection("test"), CobblerCommand.makeCobblerName(k), d); - p.setKickstart(k.getCobblerFileName()); + p.setKickstart(k.buildCobblerFileName()); k.setCobblerId(p.getUid()); = } @@ -175,7 +175,7 @@ public class KickstartDataTest extends BaseTestCaseWith= User { k =3D (KickstartData) reload(k); KickstartFactory.saveKickstartData(k); = - String contents =3D FileUtils.readStringFromFile(k.getCobblerFileN= ame()); + String contents =3D FileUtils.readStringFromFile(k.buildCobblerFil= eName()); assertTrue(contents.indexOf("\\$") > 0); assertTrue(contents.indexOf("\\$" + KickstartUrlHelper.COBBLER_MEDIA_VARIABLE) < 0); @@ -285,7 +285,7 @@ public class KickstartDataTest extends BaseTestCaseWith= User { assertNull(lookupById(user.getOrg(), ksd.getId())); assertNull(lookupByLabel(ksd.getLabel())); = - String path =3D ksd.getCobblerFileName(); + String path =3D ksd.buildCobblerFileName(); File f =3D new File(path); assertFalse(f.exists()); = --===============0247675634767001651==-- From adelton at fedoraproject.org Thu Aug 20 12:13:31 2015 Content-Type: multipart/mixed; boundary="===============2319814267463763464==" MIME-Version: 1.0 From: Jan Pazdziora To: spacewalk-commits at lists.fedorahosted.org Subject: 2 commits - backend/satellite_tools branding/spacewalk-branding.spec java/buildconf java/build.xml java/scripts java/spacewalk-java.spec projects/oracle-lib-compat spacewalk/admin Date: Tue, 04 Dec 2012 08:07:45 +0000 Message-ID: <20121204080745.240B7A0E24@fedorahosted.org> --===============2319814267463763464== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable backend/satellite_tools/spacewalk-debug | 2 - branding/spacewalk-branding.spec | 12 ++++++ java/build.xml | 7 +++ java/buildconf/build-props-tomcat7.xml | 7 +++ java/scripts/unittest.xml | 1 = java/spacewalk-java.spec | 41 +++++++++++++++++= ++++- projects/oracle-lib-compat/oracle-lib-compat.spec | 4 ++ spacewalk/admin/spacewalk-service | 4 ++ 8 files changed, 76 insertions(+), 2 deletions(-) New commits: commit 08efbafbc72f8832468aea6b3b27c2ac9ec6b46b Author: Jan Pazdziora Date: Tue Nov 20 14:11:13 2012 +0100 Do not package tomcat 7 stuff from buildroot. diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index a154c66..ee858d3 100644 --- a/java/spacewalk-java.spec +++ b/java/spacewalk-java.spec @@ -476,7 +476,7 @@ ln -s -f %{_javadir}/mchange-commons.jar $RPM_BUILD_ROO= T%{jardir}/mchange-common rm -rf $RPM_BUILD_ROOT%{jardir}/jspapi.jar rm -rf $RPM_BUILD_ROOT%{jardir}/jasper5-compiler.jar rm -rf $RPM_BUILD_ROOT%{jardir}/jasper5-runtime.jar -rm -rf $RPM_BUILD_ROOT%{jardir}/tomcat6*.jar +rm -rf $RPM_BUILD_ROOT%{jardir}/tomcat*.jar %if 0%{?omit_tests} > 0 rm -rf $RPM_BUILD_ROOT%{_datadir}/rhn/lib/rhn-test.jar rm -rf $RPM_BUILD_ROOT/classes/com/redhat/rhn/common/conf/test/conf commit fa851bcebec68c07596ad5e215b09cfdf4c8e947 Author: Jan Pazdziora Date: Mon Nov 19 13:11:12 2012 +0100 On Fedoras, start to use tomcat >=3D 7. diff --git a/backend/satellite_tools/spacewalk-debug b/backend/satellite_to= ols/spacewalk-debug index 6b21ac0..90efd48 100755 --- a/backend/satellite_tools/spacewalk-debug +++ b/backend/satellite_tools/spacewalk-debug @@ -117,7 +117,7 @@ if [ -d /etc/jabberd ]; then fi = # tomcat for spacewalk 400+ -for tomcat in tomcat5 tomcat6 ; do +for tomcat in tomcat tomcat5 tomcat6 ; do if [ -d /etc/$tomcat ]; then cp -fapRd /etc/$tomcat $DIR/conf/tomcat fi diff --git a/branding/spacewalk-branding.spec b/branding/spacewalk-branding= .spec index d01876c..e996872 100644 --- a/branding/spacewalk-branding.spec +++ b/branding/spacewalk-branding.spec @@ -36,8 +36,12 @@ install -d -m 755 %{buildroot}%{_datadir}/rhn/lib/ %if 0%{?rhel} && 0%{?rhel} < 6 install -d -m 755 %{buildroot}%{_var}/lib/tomcat5/webapps/rhn/WEB-INF/lib/ %else +%if 0%{?fedora} +install -d -m 755 %{buildroot}%{_var}/lib/tomcat/webapps/rhn/WEB-INF/lib/ +%else install -d -m 755 %{buildroot}%{_var}/lib/tomcat6/webapps/rhn/WEB-INF/lib/ %endif +%endif install -d -m 755 %{buildroot}/%{_sysconfdir}/rhn install -d -m 755 %{buildroot}/%{_prefix}/share/rhn/config-defaults cp -pR css %{buildroot}/%{_var}/www/html/ @@ -52,8 +56,12 @@ cp -pR java-branding.jar %{buildroot}%{_datadir}/rhn/lib/ %if 0%{?rhel} && 0%{?rhel} < 6 ln -s %{_datadir}/rhn/lib/java-branding.jar %{buildroot}%{_var}/lib/tomcat= 5/webapps/rhn/WEB-INF/lib/java-branding.jar %else +%if 0%{?fedora} +ln -s %{_datadir}/rhn/lib/java-branding.jar %{buildroot}%{_var}/lib/tomcat= /webapps/rhn/WEB-INF/lib/java-branding.jar +%else ln -s %{_datadir}/rhn/lib/java-branding.jar %{buildroot}%{_var}/lib/tomcat= 6/webapps/rhn/WEB-INF/lib/java-branding.jar %endif +%endif cp -p conf/rhn_docs.conf %{buildroot}/%{_prefix}/share/rhn/config-defaults= /rhn_docs.conf = %clean @@ -76,8 +84,12 @@ rm -rf %{buildroot} %if 0%{?rhel} && 0%{?rhel} < 6 %{_var}/lib/tomcat5/webapps/rhn/WEB-INF/lib/java-branding.jar %else +%if 0%{?fedora} +%{_var}/lib/tomcat/webapps/rhn/WEB-INF/lib/java-branding.jar +%else %{_var}/lib/tomcat6/webapps/rhn/WEB-INF/lib/java-branding.jar %endif +%endif %{_prefix}/share/rhn/config-defaults/rhn_docs.conf %doc LICENSE = diff --git a/java/build.xml b/java/build.xml index d29b7db..1431394 100644 --- a/java/build.xml +++ b/java/build.xml @@ -6,6 +6,7 @@ + @@ -837,6 +838,12 @@ delete from rhnChannel where label like 'ChannelLabel%= '; = + + + + + + = + + + + + + diff --git a/java/scripts/unittest.xml b/java/scripts/unittest.xml index 108e7f5..d4f96a3 100644 --- a/java/scripts/unittest.xml +++ b/java/scripts/unittest.xml @@ -8,6 +8,7 @@ = + = diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index 81fad6f..a154c66 100644 --- a/java/spacewalk-java.spec +++ b/java/spacewalk-java.spec @@ -9,9 +9,14 @@ %define appdir %{_localstatedir}/lib/tomcat5/webapps %define jardir %{_localstatedir}/lib/tomcat5/webapps/rhn/WEB-INF/= lib %else +%if 0%{?fedora} +%define appdir %{_localstatedir}/lib/tomcat/webapps +%define jardir %{_localstatedir}/lib/tomcat/webapps/rhn/WEB-INF/l= ib +%else %define appdir %{_localstatedir}/lib/tomcat6/webapps %define jardir %{_localstatedir}/lib/tomcat6/webapps/rhn/WEB-INF/= lib %endif +%endif = %if 0%{?rhel} && 0%{?rhel} >=3D 6 # checkstyle is broken on Fedoras - we skip for now @@ -72,12 +77,20 @@ Requires: jasper5 Requires: tomcat5-servlet-2.4-api Requires: struts >=3D 0:1.2.9 %else +%if 0%{?fedora} +Requires: tomcat >=3D 7 +Requires: tomcat-lib >=3D 7 +Requires: tomcat-servlet-3.0-api >=3D 7 +Requires: struts >=3D 0:1.3.0 +Requires: struts-taglib >=3D 0:1.3.0 +%else Requires: tomcat6 Requires: tomcat6-lib Requires: tomcat6-servlet-2.5-api Requires: struts >=3D 0:1.3.0 Requires: struts-taglib >=3D 0:1.3.0 %endif +%endif Requires: xalan-j2 >=3D 0:2.6.0 Requires: xerces-j2 Requires: simple-core @@ -151,11 +164,19 @@ BuildRequires: struts >=3D 0:1.2.9 BuildRequires: jsp BuildRequires: jasper5 %else +%if 0%{?fedora} +BuildRequires: struts >=3D 0:1.3.0 +BuildRequires: struts-taglib >=3D 0:1.3.0 +BuildRequires: tomcat >=3D 7 +BuildRequires: tomcat-lib >=3D 7 +BuildRequires: jpackage-utils +%else BuildRequires: struts >=3D 0:1.3.0 BuildRequires: struts-taglib >=3D 0:1.3.0 BuildRequires: tomcat6 BuildRequires: tomcat6-lib %endif +%endif BuildRequires: sitemesh BuildRequires: postgresql-jdbc %if 0%{?fedora} @@ -210,8 +231,12 @@ Requires: ojdbc14 %if 0%{?rhel} && 0%{?rhel} < 6 Requires: tomcat5 %else +%if 0%{?fedora} +Requires: tomcat >=3D 7 +%else Requires: tomcat6 %endif +%endif Provides: spacewalk-java-jdbc =3D %{version}-%{release} = %description oracle @@ -224,8 +249,12 @@ Requires: postgresql-jdbc %if 0%{?rhel} && 0%{?rhel} < 6 Requires: tomcat5 %else +%if 0%{?fedora} +Requires: tomcat >=3D 7 +%else Requires: tomcat6 %endif +%endif Provides: spacewalk-java-jdbc =3D %{version}-%{release} = %description postgresql @@ -372,10 +401,16 @@ ant -Dprefix=3D$RPM_BUILD_ROOT install-tomcat5 install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/tomcat5/Catalina/localhost/ install -m 755 conf/rhn.xml $RPM_BUILD_ROOT%{_sysconfdir}/tomcat5/Catalina= /localhost/rhn.xml %else +%if 0%{?fedora} +ant -Dprefix=3D$RPM_BUILD_ROOT install-tomcat7 +install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/tomcat/Catalina/localhost/ +install -m 755 conf/rhn.xml $RPM_BUILD_ROOT%{_sysconfdir}/tomcat/Catalina/= localhost/rhn.xml +%else ant -Dprefix=3D$RPM_BUILD_ROOT install-tomcat6 install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/tomcat6/Catalina/localhost/ install -m 755 conf/rhn.xml $RPM_BUILD_ROOT%{_sysconfdir}/tomcat6/Catalina= /localhost/rhn.xml %endif +%endif = # check spelling errors in all resources for English if aspell installed [ -x "$(which aspell)" ] && scripts/spelling/check_java.sh .. en_US @@ -588,8 +623,12 @@ fi %if 0%{?rhel} && 0%{?rhel} < 6 %config(noreplace) %{_sysconfdir}/tomcat5/Catalina/localhost/rhn.xml %else +%if 0%{?fedora} +%config(noreplace) %{_sysconfdir}/tomcat/Catalina/localhost/rhn.xml +%else %config(noreplace) %{_sysconfdir}/tomcat6/Catalina/localhost/rhn.xml %endif +%endif %{realcobsnippetsdir}/spacewalk %attr(755, tomcat, root) %{_var}/spacewalk/systemlogs %ghost %attr(644, tomcat, root) %{_var}/spacewalk/systemlogs/audit-review.= log diff --git a/projects/oracle-lib-compat/oracle-lib-compat.spec b/projects/o= racle-lib-compat/oracle-lib-compat.spec index 2b40628..5e7129e 100644 --- a/projects/oracle-lib-compat/oracle-lib-compat.spec +++ b/projects/oracle-lib-compat/oracle-lib-compat.spec @@ -84,8 +84,12 @@ ln -s ../../%{_lib}/oracle/%{icdir}/client/lib/ojdbc6.ja= r $RPM_BUILD_ROOT/%{_jav %if 0%{?rhel} && 0%{?rhel} < 6 %define tomcatname tomcat5 %else +%if 0%{?fedora} +%define tomcatname tomcat +%else %define tomcatname tomcat6 %endif +%endif install -d $RPM_BUILD_ROOT%{_datadir}/%{tomcatname}/bin install tomcat-setenv.sh $RPM_BUILD_ROOT%{_datadir}/%{tomcatname}/bin/sete= nv.sh = diff --git a/spacewalk/admin/spacewalk-service b/spacewalk/admin/spacewalk-= service index eb56dd0..2a76fb7 100755 --- a/spacewalk/admin/spacewalk-service +++ b/spacewalk/admin/spacewalk-service @@ -32,6 +32,10 @@ if [ -x /etc/init.d/tomcat6 -o -x /lib/systemd/system/to= mcat6.service ]; then TOMCAT=3D"tomcat6" fi = +if [ /lib/systemd/system/tomcat.service ]; then + TOMCAT=3D"tomcat" +fi + = SERVICES=3D"jabberd $DB_SERVICE $TOMCAT httpd osa-dispatcher Monitoring Mo= nitoringScout rhn-search cobblerd taskomatic" if [ -f /etc/rhn/service-list ] ; then --===============2319814267463763464==-- From adelton at fedoraproject.org Thu Aug 20 12:13:31 2015 Content-Type: multipart/mixed; boundary="===============4695586708479176966==" MIME-Version: 1.0 From: Jan Pazdziora To: spacewalk-commits at lists.fedorahosted.org Subject: 5 commits - backend/spacewalk-backend.spec branding/spacewalk-branding.spec java/spacewalk-java.spec projects/oracle-lib-compat rel-eng/packages spacewalk/admin Date: Tue, 04 Dec 2012 08:09:43 +0000 Message-ID: <20121204080943.902B5146E@hosted02.fedoraproject.org> --===============4695586708479176966== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable backend/spacewalk-backend.spec | 5 ++++- branding/spacewalk-branding.spec | 5 ++++- java/spacewalk-java.spec | 11 ++++++++++- projects/oracle-lib-compat/oracle-lib-compat.spec | 5 ++++- rel-eng/packages/oracle-lib-compat | 2 +- rel-eng/packages/spacewalk-admin | 2 +- rel-eng/packages/spacewalk-backend | 2 +- rel-eng/packages/spacewalk-branding | 2 +- rel-eng/packages/spacewalk-java | 2 +- spacewalk/admin/spacewalk-admin.spec | 5 ++++- 10 files changed, 31 insertions(+), 10 deletions(-) New commits: commit e22a551ff54403cd6d5753376c8069c94543ee17 Author: Jan Pazdziora Date: Tue Dec 4 09:09:31 2012 +0100 Automatic commit of package [oracle-lib-compat] release [11.2.0.8-1]. diff --git a/projects/oracle-lib-compat/oracle-lib-compat.spec b/projects/o= racle-lib-compat/oracle-lib-compat.spec index 5e7129e..e10756b 100644 --- a/projects/oracle-lib-compat/oracle-lib-compat.spec +++ b/projects/oracle-lib-compat/oracle-lib-compat.spec @@ -1,5 +1,5 @@ Name: oracle-lib-compat -Version: 11.2.0.7 +Version: 11.2.0.8 Release: 1%{?dist} Summary: Compatibility package so that perl-DBD-Oracle will install Group: Applications/Multimedia @@ -118,6 +118,9 @@ find %{_prefix}/lib/oracle/%{icdir} \ | xargs execstack -c = %changelog +* Tue Dec 04 2012 Jan Pazdziora 11.2.0.8-1 +- On Fedoras, start to use tomcat >=3D 7. + * Mon Oct 08 2012 Jan Pazdziora 11.2.0.7-1 - Require latest greatest oracle-instantclient11.2-*. - %%defattr is not needed since rpm 4.4 diff --git a/rel-eng/packages/oracle-lib-compat b/rel-eng/packages/oracle-l= ib-compat index 82dbbc4..4866be4 100644 --- a/rel-eng/packages/oracle-lib-compat +++ b/rel-eng/packages/oracle-lib-compat @@ -1 +1 @@ -11.2.0.7-1 projects/oracle-lib-compat/ +11.2.0.8-1 projects/oracle-lib-compat/ commit fcdb3463507d2ff11f8282f0fec3a0cfa86b7194 Author: Jan Pazdziora Date: Tue Dec 4 09:09:15 2012 +0100 Automatic commit of package [spacewalk-java] release [1.9.26-1]. diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index ee858d3..7de10c3 100644 --- a/java/spacewalk-java.spec +++ b/java/spacewalk-java.spec @@ -28,7 +28,7 @@ Name: spacewalk-java Summary: Spacewalk Java site packages Group: Applications/Internet License: GPLv2 -Version: 1.9.25 +Version: 1.9.26 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{versi= on}.tar.gz = @@ -659,6 +659,15 @@ fi %{jardir}/postgresql-jdbc.jar = %changelog +* Tue Dec 04 2012 Jan Pazdziora 1.9.26-1 +- Do not package tomcat 7 stuff from buildroot. +- On Fedoras, start to use tomcat >=3D 7. +- KickstartDataTest should no longer fail +- 881830 - create /var/lib/rhn/kickstarts/wizard/*.cfg files if missing by= the + KickstartFileSyncTask +- PackageHelperTest should no more fail at testPackageToMap +- ActionFormatterTest should no more fail at testErrataFormatter + * Fri Nov 30 2012 Tomas Lestach 1.9.25-1 - do not include engine.js twice - remove embedded dwr from spacewalk-java and start using dwr package diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-j= ava index f964c42..1ced086 100644 --- a/rel-eng/packages/spacewalk-java +++ b/rel-eng/packages/spacewalk-java @@ -1 +1 @@ -1.9.25-1 java/ +1.9.26-1 java/ commit fa750a0ca0a031121410c33ece02a7f4c0c5eae9 Author: Jan Pazdziora Date: Tue Dec 4 09:09:08 2012 +0100 Automatic commit of package [spacewalk-backend] release [1.9.11-1]. diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec index 773bab7..7dd69fc 100644 --- a/backend/spacewalk-backend.spec +++ b/backend/spacewalk-backend.spec @@ -12,7 +12,7 @@ Name: spacewalk-backend Summary: Common programs needed to be installed on the Spacewalk servers/p= roxies Group: Applications/Internet License: GPLv2 -Version: 1.9.10 +Version: 1.9.11 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version= }.tar.gz @@ -637,6 +637,9 @@ rm -f %{rhnconf}/rhnSecret.py* = # $Id$ %changelog +* Tue Dec 04 2012 Jan Pazdziora 1.9.11-1 +- On Fedoras, start to use tomcat >=3D 7. + * Fri Nov 30 2012 Jan Pazdziora 1.9.10-1 - 877451 - read the repo config from yumbase - 877451 - correct the proxy configuration logic diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewal= k-backend index 285093d..f2a9bbb 100644 --- a/rel-eng/packages/spacewalk-backend +++ b/rel-eng/packages/spacewalk-backend @@ -1 +1 @@ -1.9.10-1 backend/ +1.9.11-1 backend/ commit 591e0322ad1a820c527258809080d7f4c65c7a6e Author: Jan Pazdziora Date: Tue Dec 4 09:08:58 2012 +0100 Automatic commit of package [spacewalk-branding] release [1.9.4-1]. diff --git a/branding/spacewalk-branding.spec b/branding/spacewalk-branding= .spec index e996872..7e8bcac62 100644 --- a/branding/spacewalk-branding.spec +++ b/branding/spacewalk-branding.spec @@ -1,5 +1,5 @@ Name: spacewalk-branding -Version: 1.9.3 +Version: 1.9.4 Release: 1%{?dist} Summary: Spacewalk branding data = @@ -94,6 +94,9 @@ rm -rf %{buildroot} %doc LICENSE = %changelog +* Tue Dec 04 2012 Jan Pazdziora 1.9.4-1 +- On Fedoras, start to use tomcat >=3D 7. + * Wed Nov 28 2012 Tomas Lestach 1.9.3-1 - 470463 - fixing xmllint issue = diff --git a/rel-eng/packages/spacewalk-branding b/rel-eng/packages/spacewa= lk-branding index 4bbec71..01e7685 100644 --- a/rel-eng/packages/spacewalk-branding +++ b/rel-eng/packages/spacewalk-branding @@ -1 +1 @@ -1.9.3-1 branding/ +1.9.4-1 branding/ commit b3ab968d2213c17f8ceb5bb9c007c38b52b78d50 Author: Jan Pazdziora Date: Tue Dec 4 09:08:44 2012 +0100 Automatic commit of package [spacewalk-admin] release [1.9.1-1]. diff --git a/rel-eng/packages/spacewalk-admin b/rel-eng/packages/spacewalk-= admin index 1f7da10..08d3f70 100644 --- a/rel-eng/packages/spacewalk-admin +++ b/rel-eng/packages/spacewalk-admin @@ -1 +1 @@ -1.8.6-1 spacewalk/admin/ +1.9.1-1 spacewalk/admin/ diff --git a/spacewalk/admin/spacewalk-admin.spec b/spacewalk/admin/spacewa= lk-admin.spec index 1ead3a8..173539d 100644 --- a/spacewalk/admin/spacewalk-admin.spec +++ b/spacewalk/admin/spacewalk-admin.spec @@ -2,7 +2,7 @@ Summary: Various utility scripts and data files for RHN Satellite installa= tions Name: spacewalk-admin URL: https://fedorahosted.org/spacewalk -Version: 1.9.0 +Version: 1.9.1 Release: 1%{?dist} Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version= }.tar.gz License: GPLv2 @@ -75,6 +75,9 @@ rm -rf $RPM_BUILD_ROOT %config(noreplace) %{_sysconfdir}/rhn/service-list = %changelog +* Tue Dec 04 2012 Jan Pazdziora 1.9.1-1 +- On Fedoras, start to use tomcat >=3D 7. + * Tue Oct 30 2012 Jan Pazdziora 1.8.6-1 - Update the copyright year. - %%defattr is not needed since rpm 4.4 --===============4695586708479176966==-- From adelton at fedoraproject.org Thu Aug 20 12:13:31 2015 Content-Type: multipart/mixed; boundary="===============1455707320350757920==" MIME-Version: 1.0 From: Jan Pazdziora To: spacewalk-commits at lists.fedorahosted.org Subject: Changes to 'refs/tags/oracle-lib-compat-11.2.0.8-1' Date: Tue, 04 Dec 2012 08:09:53 +0000 Message-ID: <20121204080953.D532AA0DA1@fedorahosted.org> --===============1455707320350757920== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Tag 'oracle-lib-compat-11.2.0.8-1' created by Jan Pazdziora at 2012-12-04 08:09 +0000 Tagging package [oracle-lib-compat] version [11.2.0.8-1] in directory [proj= ects/oracle-lib-compat/]. Changes since spacewalk-java-1.9.25-1: Jan Pazdziora (7): On Fedoras, start to use tomcat >=3D 7. Do not package tomcat 7 stuff from buildroot. Automatic commit of package [spacewalk-admin] release [1.9.1-1]. Automatic commit of package [spacewalk-branding] release [1.9.4-1]. Automatic commit of package [spacewalk-backend] release [1.9.11-1]. Automatic commit of package [spacewalk-java] release [1.9.26-1]. Automatic commit of package [oracle-lib-compat] release [11.2.0.8-1]. Tomas Kasparek (3): ActionFormatterTest should no more fail at testErrataFormatter PackageHelperTest should no more fail at testPackageToMap KickstartDataTest should no longer fail Tomas Lestach (1): 881830 - create /var/lib/rhn/kickstarts/wizard/*.cfg files if missing= by the KickstartFileSyncTask --- backend/satellite_tools/spacewalk-debug = | 2 = backend/spacewalk-backend.spec = | 5 = branding/spacewalk-branding.spec = | 17 +++ java/build.xml = | 7 + java/buildconf/build-props-tomcat7.xml = | 7 + java/code/src/com/redhat/rhn/domain/action/test/ActionFormatterTest.java = | 2 = java/code/src/com/redhat/rhn/domain/kickstart/KickstartFactory.java = | 2 = java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartDataTest.java = | 6 - java/code/src/com/redhat/rhn/domain/rhnpackage/test/PackageTest.java = | 2 = java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfileEditC= ommand.java | 8 + java/scripts/unittest.xml = | 1 = java/spacewalk-java.spec = | 52 +++++++++- projects/oracle-lib-compat/oracle-lib-compat.spec = | 9 + rel-eng/packages/oracle-lib-compat = | 2 = rel-eng/packages/spacewalk-admin = | 2 = rel-eng/packages/spacewalk-backend = | 2 = rel-eng/packages/spacewalk-branding = | 2 = rel-eng/packages/spacewalk-java = | 2 = spacewalk/admin/spacewalk-admin.spec = | 5 = spacewalk/admin/spacewalk-service = | 4 = 20 files changed, 120 insertions(+), 19 deletions(-) --- --===============1455707320350757920==-- From adelton at fedoraproject.org Thu Aug 20 12:13:31 2015 Content-Type: multipart/mixed; boundary="===============8378617917297939518==" MIME-Version: 1.0 From: Jan Pazdziora To: spacewalk-commits at lists.fedorahosted.org Subject: Changes to 'refs/tags/spacewalk-admin-1.9.1-1' Date: Tue, 04 Dec 2012 08:09:56 +0000 Message-ID: <20121204080956.57553A0DA1@fedorahosted.org> --===============8378617917297939518== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Tag 'spacewalk-admin-1.9.1-1' created by Jan Pazdziora at 2012-12-04 08:08 +0000 Tagging package [spacewalk-admin] version [1.9.1-1] in directory [spacewalk= /admin/]. Changes since spacewalk-java-1.9.25-1: Jan Pazdziora (3): On Fedoras, start to use tomcat >=3D 7. Do not package tomcat 7 stuff from buildroot. Automatic commit of package [spacewalk-admin] release [1.9.1-1]. Tomas Kasparek (3): ActionFormatterTest should no more fail at testErrataFormatter PackageHelperTest should no more fail at testPackageToMap KickstartDataTest should no longer fail Tomas Lestach (1): 881830 - create /var/lib/rhn/kickstarts/wizard/*.cfg files if missing= by the KickstartFileSyncTask --- backend/satellite_tools/spacewalk-debug = | 2 = branding/spacewalk-branding.spec = | 12 ++ java/build.xml = | 7 + java/buildconf/build-props-tomcat7.xml = | 7 + java/code/src/com/redhat/rhn/domain/action/test/ActionFormatterTest.java = | 2 = java/code/src/com/redhat/rhn/domain/kickstart/KickstartFactory.java = | 2 = java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartDataTest.java = | 6 - java/code/src/com/redhat/rhn/domain/rhnpackage/test/PackageTest.java = | 2 = java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfileEditC= ommand.java | 8 + java/scripts/unittest.xml = | 1 = java/spacewalk-java.spec = | 41 +++++++++- projects/oracle-lib-compat/oracle-lib-compat.spec = | 4 = rel-eng/packages/spacewalk-admin = | 2 = spacewalk/admin/spacewalk-admin.spec = | 5 - spacewalk/admin/spacewalk-service = | 4 = 15 files changed, 94 insertions(+), 11 deletions(-) --- --===============8378617917297939518==-- From adelton at fedoraproject.org Thu Aug 20 12:13:31 2015 Content-Type: multipart/mixed; boundary="===============5874488293615742690==" MIME-Version: 1.0 From: Jan Pazdziora To: spacewalk-commits at lists.fedorahosted.org Subject: Changes to 'refs/tags/spacewalk-backend-1.9.11-1' Date: Tue, 04 Dec 2012 08:09:58 +0000 Message-ID: <20121204080958.5BAEBA0DA1@fedorahosted.org> --===============5874488293615742690== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Tag 'spacewalk-backend-1.9.11-1' created by Jan Pazdziora at 2012-12-04 08:09 +0000 Tagging package [spacewalk-backend] version [1.9.11-1] in directory [backen= d/]. Changes since spacewalk-admin-1.9.1-1: Jan Pazdziora (2): Automatic commit of package [spacewalk-branding] release [1.9.4-1]. Automatic commit of package [spacewalk-backend] release [1.9.11-1]. --- backend/spacewalk-backend.spec | 5 ++++- branding/spacewalk-branding.spec | 5 ++++- rel-eng/packages/spacewalk-backend | 2 +- rel-eng/packages/spacewalk-branding | 2 +- 4 files changed, 10 insertions(+), 4 deletions(-) --- --===============5874488293615742690==-- From adelton at fedoraproject.org Thu Aug 20 12:13:31 2015 Content-Type: multipart/mixed; boundary="===============2731532135634103568==" MIME-Version: 1.0 From: Jan Pazdziora To: spacewalk-commits at lists.fedorahosted.org Subject: Changes to 'refs/tags/spacewalk-branding-1.9.4-1' Date: Tue, 04 Dec 2012 08:10:00 +0000 Message-ID: <20121204081000.4BFE6A0DA1@fedorahosted.org> --===============2731532135634103568== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Tag 'spacewalk-branding-1.9.4-1' created by Jan Pazdziora at 2012-12-04 08:08 +0000 Tagging package [spacewalk-branding] version [1.9.4-1] in directory [brandi= ng/]. Changes since spacewalk-admin-1.9.1-1: Jan Pazdziora (1): Automatic commit of package [spacewalk-branding] release [1.9.4-1]. --- branding/spacewalk-branding.spec | 5 ++++- rel-eng/packages/spacewalk-branding | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) --- --===============2731532135634103568==-- From adelton at fedoraproject.org Thu Aug 20 12:13:31 2015 Content-Type: multipart/mixed; boundary="===============2737295714218300098==" MIME-Version: 1.0 From: Jan Pazdziora To: spacewalk-commits at lists.fedorahosted.org Subject: Changes to 'refs/tags/spacewalk-java-1.9.26-1' Date: Tue, 04 Dec 2012 08:10:02 +0000 Message-ID: <20121204081002.C9F77A0DA1@fedorahosted.org> --===============2737295714218300098== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Tag 'spacewalk-java-1.9.26-1' created by Jan Pazdziora at 2012-12-04 08:09 +0000 Tagging package [spacewalk-java] version [1.9.26-1] in directory [java/]. Changes since spacewalk-backend-1.9.11-1: Jan Pazdziora (1): Automatic commit of package [spacewalk-java] release [1.9.26-1]. --- java/spacewalk-java.spec | 11 ++++++++++- rel-eng/packages/spacewalk-java | 2 +- 2 files changed, 11 insertions(+), 2 deletions(-) --- --===============2737295714218300098==-- From tlestach at fedoraproject.org Thu Aug 20 12:13:31 2015 Content-Type: multipart/mixed; boundary="===============9207851473509234437==" MIME-Version: 1.0 From: Tomas Lestach To: spacewalk-commits at lists.fedorahosted.org Subject: java/code Date: Tue, 04 Dec 2012 18:22:30 +0000 Message-ID: <20121204182230.C95DFAAB80@fedorahosted.org> --===============9207851473509234437== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/webapp/WEB-INF/dwr.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) New commits: commit b4b725678e4ebc289686674703b59870c2d96c50 Author: Tomas Lestach Date: Tue Dec 4 18:04:15 2012 +0100 use dwr30.dtd insted of dwr20.dtd diff --git a/java/code/webapp/WEB-INF/dwr.xml b/java/code/webapp/WEB-INF/dw= r.xml index b42b541..f6b8ee1 100644 --- a/java/code/webapp/WEB-INF/dwr.xml +++ b/java/code/webapp/WEB-INF/dwr.xml @@ -1,5 +1,4 @@ - + = --===============9207851473509234437==-- From sherr at fedoraproject.org Thu Aug 20 12:13:33 2015 Content-Type: multipart/mixed; boundary="===============1237544547871274992==" MIME-Version: 1.0 From: StephenHerr To: spacewalk-commits at lists.fedorahosted.org Subject: java/code Date: Tue, 04 Dec 2012 20:49:45 +0000 Message-ID: <20121204204945.B8FE6227C@hosted02.fedoraproject.org> --===============1237544547871274992== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/common/db/datasource/xml/Task_queries.xml | = 24 +++------- 1 file changed, 8 insertions(+), 16 deletions(-) New commits: commit 165189729784f9134f5bd9d5090df2f9588eff54 Author: Stephen Herr Date: Tue Dec 4 15:49:08 2012 -0500 883546 - repodata inconsistency due to concurrent modification diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Task_que= ries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Task_queri= es.xml index fa1de80..f75d967 100644 --- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Task_queries.xml +++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Task_queries.xml @@ -606,12 +606,11 @@ where rhnChannelErrata.errata_id =3D rhnErrataPackage= .errata_id SELECT chpkg.package_id, pkgcap.id, pkgcap.name, pkgcap.version FROM rhnPackageFile pkgf, rhnPackageCapability pkgcap, - rhnChannelPackage chpkg left join rhnPackageRepodata prd ON prd.= package_id =3D chpkg.package_id + rhnChannelPackage chpkg WHERE chpkg.package_id =3D pkgf.package_id AND pkgf.capability_id =3D pkgcap.id AND chpkg.channel_id =3D :channel_id - AND prd.primary_xml is null ORDER BY pkgf.package_id @@ -620,12 +619,11 @@ where rhnChannelErrata.errata_id =3D rhnErrataPackage= .errata_id SELECT chpkg.package_id, pkgcap.id, pkgcap.name, pkgcap.version, pkgp.se= nse FROM rhnPackageProvides pkgp, rhnPackageCapability pkgcap, - rhnChannelPackage chpkg left join rhnPackageRepodata prd ON prd.pack= age_id =3D chpkg.package_id + rhnChannelPackage chpkg WHERE chpkg.package_id =3D pkgp.package_id AND pkgp.capability_id =3D pkgcap.id AND chpkg.channel_id =3D :channel_id - AND prd.primary_xml is null ORDER BY pkgp.package_id @@ -634,12 +632,11 @@ where rhnChannelErrata.errata_id =3D rhnErrataPackage= .errata_id SELECT chpkg.package_id, pkgcap.id, pkgcap.name, pkgcap.version, pkgp.se= nse FROM rhnPackageRequires pkgp, rhnPackageCapability pkgcap, - rhnChannelPackage chpkg left join rhnPackageRepodata prd ON prd.pack= age_id =3D chpkg.package_id + rhnChannelPackage chpkg WHERE chpkg.package_id =3D pkgp.package_id AND pkgp.capability_id =3D pkgcap.id AND chpkg.channel_id =3D :channel_id - AND prd.primary_xml is null ORDER BY pkgp.package_id @@ -648,12 +645,11 @@ where rhnChannelErrata.errata_id =3D rhnErrataPackage= .errata_id SELECT chpkg.package_id, pkgcap.id, pkgcap.name, pkgcap.version, pkgp.se= nse FROM rhnPackageConflicts pkgp, rhnPackageCapability pkgcap, - rhnChannelPackage chpkg left join rhnPackageRepodata prd ON prd.pack= age_id =3D chpkg.package_id + rhnChannelPackage chpkg WHERE chpkg.package_id =3D pkgp.package_id AND pkgp.capability_id =3D pkgcap.id AND chpkg.channel_id =3D :channel_id - AND prd.primary_xml is null ORDER BY pkgp.package_id @@ -662,12 +658,11 @@ where rhnChannelErrata.errata_id =3D rhnErrataPackage= .errata_id SELECT chpkg.package_id, pkgcap.id, pkgcap.name, pkgcap.version, pkgp.se= nse FROM rhnPackageObsoletes pkgp, rhnPackageCapability pkgcap, - rhnChannelPackage chpkg left join rhnPackageRepodata prd ON prd.pack= age_id =3D chpkg.package_id + rhnChannelPackage chpkg WHERE chpkg.package_id =3D pkgp.package_id AND pkgp.capability_id =3D pkgcap.id AND chpkg.channel_id =3D :channel_id - AND prd.primary_xml is null ORDER BY pkgp.package_id @@ -676,12 +671,11 @@ where rhnChannelErrata.errata_id =3D rhnErrataPackage= .errata_id SELECT chpkg.package_id, pkgcap.id, pkgcap.name, pkgcap.version, pkgp.se= nse FROM rhnPackageRecommends pkgp, rhnPackageCapability pkgcap, - rhnChannelPackage chpkg left join rhnPackageRepodata prd ON prd.= package_id =3D chpkg.package_id + rhnChannelPackage chpkg WHERE chpkg.package_id =3D pkgp.package_id AND pkgp.capability_id =3D pkgcap.id AND chpkg.channel_id =3D :channel_id - AND prd.primary_xml is null ORDER BY pkgp.package_id @@ -690,12 +684,11 @@ where rhnChannelErrata.errata_id =3D rhnErrataPackage= .errata_id SELECT chpkg.package_id, pkgcap.id, pkgcap.name, pkgcap.version, pkgp.se= nse FROM rhnPackageSuggests pkgp, rhnPackageCapability pkgcap, - rhnChannelPackage chpkg left join rhnPackageRepodata prd ON prd.= package_id =3D chpkg.package_id + rhnChannelPackage chpkg WHERE chpkg.package_id =3D pkgp.package_id AND pkgp.capability_id =3D pkgcap.id AND chpkg.channel_id =3D :channel_id - AND prd.primary_xml is null ORDER BY pkgp.package_id @@ -704,12 +697,11 @@ where rhnChannelErrata.errata_id =3D rhnErrataPackage= .errata_id SELECT chpkg.package_id, pkgcap.id, pkgcap.name, pkgcap.version, pkgp.se= nse FROM rhnPackageSupplements pkgp, rhnPackageCapability pkgcap, - rhnChannelPackage chpkg left join rhnPackageRepodata prd ON prd.= package_id =3D chpkg.package_id + rhnChannelPackage chpkg WHERE chpkg.package_id =3D pkgp.package_id AND pkgp.capability_id =3D pkgcap.id AND chpkg.channel_id =3D :channel_id - AND prd.primary_xml is null ORDER BY pkgp.package_id --===============1237544547871274992==-- From adelton at fedoraproject.org Thu Aug 20 12:13:34 2015 Content-Type: multipart/mixed; boundary="===============3262869316111088783==" MIME-Version: 1.0 From: Jan Pazdziora To: spacewalk-commits at lists.fedorahosted.org Subject: web/modules Date: Wed, 05 Dec 2012 08:33:44 +0000 Message-ID: <20121205083344.E3698A0E0B@fedorahosted.org> --===============3262869316111088783== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable web/modules/rhn/RHN/DB/Channel.pm | 4 ++-- web/modules/sniglets/Sniglets/ListView/PackageList.pm | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) New commits: commit db69e569e0f96aebc384d039b0da6e432d9c3843 Author: Pierre Casenove Date: Tue Dec 4 17:13:05 2012 +0000 Remove sysdate keyword diff --git a/web/modules/rhn/RHN/DB/Channel.pm b/web/modules/rhn/RHN/DB/Cha= nnel.pm index 9ec6db7..70d69f7 100644 --- a/web/modules/rhn/RHN/DB/Channel.pm +++ b/web/modules/rhn/RHN/DB/Channel.pm @@ -857,7 +857,7 @@ INSERT INTO rhnRepoRegenQueue (id, channel_label, client, reason, force, bypass_filters, next_ac= tion, created, modified) VALUES (sequence_nextval('rhn_repo_regen_queue_id_seq'), - :label, 'perl-web::remove_packages_in_set', NULL, 'N', 'N', sysdat= e, sysdate, sysdate) + :label, 'perl-web::remove_packages_in_set', NULL, 'N', 'N', curren= t_timestamp, current_timestamp, current_timestamp) EOQ = $sth->execute_h(label =3D> $self->label); @@ -893,7 +893,7 @@ INSERT INTO rhnRepoRegenQueue (id, channel_label, client, reason, force, bypass_filters, next_ac= tion, created, modified) VALUES (sequence_nextval('rhn_repo_regen_queue_id_seq'), - :label, 'perl-web::add_packages_in_set', NULL, 'N', 'N', sysdate, = sysdate, sysdate) + :label, 'perl-web::add_packages_in_set', NULL, 'N', 'N', current_t= imestamp, current_timestamp, current_timestamp) EOQ = $sth->execute_h(label =3D> $self->label); diff --git a/web/modules/sniglets/Sniglets/ListView/PackageList.pm b/web/mo= dules/sniglets/Sniglets/ListView/PackageList.pm index b033187..b0aac53 100644 --- a/web/modules/sniglets/Sniglets/ListView/PackageList.pm +++ b/web/modules/sniglets/Sniglets/ListView/PackageList.pm @@ -1163,7 +1163,7 @@ INSERT INTO rhnRepoRegenQueue (id, channel_label, client, reason, force, bypass_filters, next_ac= tion, created, modified) VALUES (sequence_nextval('rhn_repo_regen_queue_id_seq'), - :label, 'perl-web::delete_packages_cb', NULL, 'N', 'N', sysdate, s= ysdate, sysdate) + :label, 'perl-web::delete_packages_cb', NULL, 'N', 'N', current_ti= mestamp, current_timestamp, current_timestamp) EOQ = foreach my $cid (@channels) { --===============3262869316111088783==-- From tkasparek at fedoraproject.org Thu Aug 20 12:13:36 2015 Content-Type: multipart/mixed; boundary="===============6669291016338391673==" MIME-Version: 1.0 From: =?utf-8?q?Tom=C3=A1=C5=A1_Ka=C5=A1p=C3=A1rek_=3Ctkasparek_at_fedoraprojec?= =?utf-8?q?t=2Eorg=3E?= To: spacewalk-commits at lists.fedorahosted.org Subject: java/code Date: Wed, 05 Dec 2012 12:54:24 +0000 Message-ID: <20121205125424.DA2F3A0E0B@fedorahosted.org> --===============6669291016338391673== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/taskomatic/task/test/KickstartFileSyncTaskTes= t.java | 1 + 1 file changed, 1 insertion(+) New commits: commit ac550c978b3df479628dda13b6970147b10da005 Author: Tomas Kasparek Date: Wed Dec 5 13:30:57 2012 +0100 KickstartFileSyncTaskTest should no longer fail = updating files from kickstart before asking whether they're existing diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/test/KickstartFil= eSyncTaskTest.java b/java/code/src/com/redhat/rhn/taskomatic/task/test/Kick= startFileSyncTaskTest.java index 913d369..971486d 100644 --- a/java/code/src/com/redhat/rhn/taskomatic/task/test/KickstartFileSyncTa= skTest.java +++ b/java/code/src/com/redhat/rhn/taskomatic/task/test/KickstartFileSyncTa= skTest.java @@ -55,6 +55,7 @@ public class KickstartFileSyncTaskTest extends RhnBaseTes= tCase { assertFalse(f.exists()); KickstartFileSyncTask task =3D new KickstartFileSyncTask(); task.execute(null); + f =3D new File(p.getKickstart()); assertTrue(f.exists()); = } --===============6669291016338391673==-- From mmraka at fedoraproject.org Thu Aug 20 12:13:36 2015 Content-Type: multipart/mixed; boundary="===============6200183644565470321==" MIME-Version: 1.0 From: Michael Mraka To: spacewalk-commits at lists.fedorahosted.org Subject: 3 commits - rel-eng/packages spec-tree/heirloom-pkgtools utils/spacewalk-clone-by-date utils/spacewalk-utils.spec Date: Wed, 05 Dec 2012 13:57:23 +0000 Message-ID: <20121205135723.A851E1208@hosted02.fedoraproject.org> --===============6200183644565470321== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable rel-eng/packages/spacewalk-utils | 2 +- spec-tree/heirloom-pkgtools/build.py.props | 3 +++ utils/spacewalk-clone-by-date | 3 ++- utils/spacewalk-utils.spec | 5 ++++- 4 files changed, 10 insertions(+), 3 deletions(-) New commits: commit 87019b96f745d420b8bede405ab759ef5c86d04b Author: Michael Mraka Date: Wed Dec 5 14:57:12 2012 +0100 Automatic commit of package [spacewalk-utils] release [1.9.5-1]. diff --git a/rel-eng/packages/spacewalk-utils b/rel-eng/packages/spacewalk-= utils index 6115978..2601d90 100644 --- a/rel-eng/packages/spacewalk-utils +++ b/rel-eng/packages/spacewalk-utils @@ -1 +1 @@ -1.9.4-1 utils/ +1.9.5-1 utils/ diff --git a/utils/spacewalk-utils.spec b/utils/spacewalk-utils.spec index 806c334..ccf9e2a 100644 --- a/utils/spacewalk-utils.spec +++ b/utils/spacewalk-utils.spec @@ -1,7 +1,7 @@ %define rhnroot %{_prefix}/share/rhn = Name: spacewalk-utils -Version: 1.9.4 +Version: 1.9.5 Release: 1%{?dist} Summary: Utilities that may be run against a Spacewalk server. = @@ -86,6 +86,9 @@ spacewalk-pylint $RPM_BUILD_ROOT%{rhnroot} = = %changelog +* Wed Dec 05 2012 Michael Mraka 1.9.5-1 +- 866930 - do not traceback when called without --to_date + * Wed Nov 21 2012 Michael Mraka 1.9.4-1 - updated according to modified distchannel API = commit 27dd711ad6c1e500ab6bbcfd42b6d044bc645d4d Author: Michael Mraka Date: Wed Dec 5 14:54:47 2012 +0100 set correct builder for heirloom-pkgtools diff --git a/spec-tree/heirloom-pkgtools/build.py.props b/spec-tree/heirloo= m-pkgtools/build.py.props new file mode 100644 index 0000000..2222932 --- /dev/null +++ b/spec-tree/heirloom-pkgtools/build.py.props @@ -0,0 +1,3 @@ +[buildconfig] +builder =3D spacewalkx.builderx.NoTgzBuilder + commit 414b6bd09d271ec0364aa159af350ba487f9e939 Author: Michael Mraka Date: Wed Dec 5 14:51:51 2012 +0100 866930 - do not traceback when called without --to_date diff --git a/utils/spacewalk-clone-by-date b/utils/spacewalk-clone-by-date index 6b1b775..95e68c7 100755 --- a/utils/spacewalk-clone-by-date +++ b/utils/spacewalk-clone-by-date @@ -163,7 +163,8 @@ def parse_args(): = = if not options.validate: - options.to_date =3D parse_time(options.to_date) + if options.to_date: + options.to_date =3D parse_time(options.to_date) = if not options.password: options.password =3D getpass.getpass() --===============6200183644565470321==-- From mmraka at fedoraproject.org Thu Aug 20 12:13:37 2015 Content-Type: multipart/mixed; boundary="===============1535368407981499233==" MIME-Version: 1.0 From: Michael Mraka To: spacewalk-commits at lists.fedorahosted.org Subject: Changes to 'refs/tags/spacewalk-utils-1.9.5-1' Date: Wed, 05 Dec 2012 13:57:34 +0000 Message-ID: <20121205135734.566BFA0E24@fedorahosted.org> --===============1535368407981499233== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Tag 'spacewalk-utils-1.9.5-1' created by Michael Mraka at 2012-12-05 13:57 +0000 Tagging package [spacewalk-utils] version [1.9.5-1] in directory [utils/]. Changes since oracle-lib-compat-11.2.0.8-1: Michael Mraka (3): 866930 - do not traceback when called without --to_date set correct builder for heirloom-pkgtools Automatic commit of package [spacewalk-utils] release [1.9.5-1]. Pierre Casenove (1): Remove sysdate keyword Stephen Herr (1): 883546 - repodata inconsistency due to concurrent modification Tomas Kasparek (1): KickstartFileSyncTaskTest should no longer fail Tomas Lestach (1): use dwr30.dtd insted of dwr20.dtd --- java/code/src/com/redhat/rhn/common/db/datasource/xml/Task_queries.xml = | 24 +++------- java/code/src/com/redhat/rhn/taskomatic/task/test/KickstartFileSyncTaskTes= t.java | 1 = java/code/webapp/WEB-INF/dwr.xml = | 3 - rel-eng/packages/spacewalk-utils = | 2 = spec-tree/heirloom-pkgtools/build.py.props = | 3 + utils/spacewalk-clone-by-date = | 3 - utils/spacewalk-utils.spec = | 5 +- web/modules/rhn/RHN/DB/Channel.pm = | 4 - web/modules/sniglets/Sniglets/ListView/PackageList.pm = | 2 = 9 files changed, 23 insertions(+), 24 deletions(-) --- --===============1535368407981499233==-- From tlestach at fedoraproject.org Thu Aug 20 12:13:37 2015 Content-Type: multipart/mixed; boundary="===============2425462184933351530==" MIME-Version: 1.0 From: Tomas Lestach To: spacewalk-commits at lists.fedorahosted.org Subject: java/code Date: Wed, 05 Dec 2012 14:40:16 +0000 Message-ID: <20121205144016.EB887A0DA6@fedorahosted.org> --===============2425462184933351530== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/frontend/action/satellite/CatalinaAction.java= | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 122533bbdfec62fd69323e82c00432ea786bc8ba Author: Tomas Lestach Date: Wed Dec 5 15:18:30 2012 +0100 update catalina.out path for tomcat7 diff --git a/java/code/src/com/redhat/rhn/frontend/action/satellite/Catalin= aAction.java b/java/code/src/com/redhat/rhn/frontend/action/satellite/Catal= inaAction.java index 0da2b26..9d4310e 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/satellite/CatalinaAction= .java +++ b/java/code/src/com/redhat/rhn/frontend/action/satellite/CatalinaAction= .java @@ -46,7 +46,7 @@ public class CatalinaAction extends RhnAction { = String catalina =3D System.getenv("CATALINA_HOME"); = - Matcher m =3D Pattern.compile("/tomcat[0-9]$").matcher(catalina); + Matcher m =3D Pattern.compile("/tomcat[0-9]*$").matcher(catalina); m.find(); = request.setAttribute("contents", --===============2425462184933351530==-- From tlestach at fedoraproject.org Thu Aug 20 12:13:38 2015 Content-Type: multipart/mixed; boundary="===============4583558734515713097==" MIME-Version: 1.0 From: Tomas Lestach To: spacewalk-commits at lists.fedorahosted.org Subject: java/spacewalk-java.spec rel-eng/packages Date: Wed, 05 Dec 2012 17:46:57 +0000 Message-ID: <20121205174657.80BE3A0DA6@fedorahosted.org> --===============4583558734515713097== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/spacewalk-java.spec | 8 +++++++- rel-eng/packages/spacewalk-java | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) New commits: commit 04ff98f50132edff976dccef2753bb069e2e83f2 Author: Tomas Lestach Date: Wed Dec 5 18:46:46 2012 +0100 Automatic commit of package [spacewalk-java] release [1.9.27-1]. diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index 7de10c3..084a9a0 100644 --- a/java/spacewalk-java.spec +++ b/java/spacewalk-java.spec @@ -28,7 +28,7 @@ Name: spacewalk-java Summary: Spacewalk Java site packages Group: Applications/Internet License: GPLv2 -Version: 1.9.26 +Version: 1.9.27 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{versi= on}.tar.gz = @@ -659,6 +659,12 @@ fi %{jardir}/postgresql-jdbc.jar = %changelog +* Wed Dec 05 2012 Tomas Lestach 1.9.27-1 +- update catalina.out path for tomcat7 +- KickstartFileSyncTaskTest should no longer fail +- 883546 - repodata inconsistency due to concurrent modification +- use dwr30.dtd insted of dwr20.dtd + * Tue Dec 04 2012 Jan Pazdziora 1.9.26-1 - Do not package tomcat 7 stuff from buildroot. - On Fedoras, start to use tomcat >=3D 7. diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-j= ava index 1ced086..3cabaf1 100644 --- a/rel-eng/packages/spacewalk-java +++ b/rel-eng/packages/spacewalk-java @@ -1 +1 @@ -1.9.26-1 java/ +1.9.27-1 java/ --===============4583558734515713097==-- From tlestach at fedoraproject.org Thu Aug 20 12:13:39 2015 Content-Type: multipart/mixed; boundary="===============3101132530452701835==" MIME-Version: 1.0 From: Tomas Lestach To: spacewalk-commits at lists.fedorahosted.org Subject: Changes to 'refs/tags/spacewalk-java-1.9.27-1' Date: Wed, 05 Dec 2012 17:47:05 +0000 Message-ID: <20121205174705.BD0DC1699@hosted02.fedoraproject.org> --===============3101132530452701835== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Tag 'spacewalk-java-1.9.27-1' created by Tomas Lestach at 2012-12-05 17:46 +0000 Tagging package [spacewalk-java] version [1.9.27-1] in directory [java/]. Changes since spacewalk-utils-1.9.5-1: Tomas Lestach (2): update catalina.out path for tomcat7 Automatic commit of package [spacewalk-java] release [1.9.27-1]. --- java/code/src/com/redhat/rhn/frontend/action/satellite/CatalinaAction.java= | 2 +- java/spacewalk-java.spec = | 8 +++++++- rel-eng/packages/spacewalk-java = | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) --- --===============3101132530452701835==-- From sherr at fedoraproject.org Thu Aug 20 12:13:39 2015 Content-Type: multipart/mixed; boundary="===============3634965917104912178==" MIME-Version: 1.0 From: StephenHerr To: spacewalk-commits at lists.fedorahosted.org Subject: java/code Date: Wed, 05 Dec 2012 20:23:11 +0000 Message-ID: <20121205202311.C141CA105D@fedorahosted.org> --===============3634965917104912178== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/common/db/datasource/xml/Task_queries.xml | = 24 ++++++---- 1 file changed, 16 insertions(+), 8 deletions(-) New commits: commit ee9e14401e60bf794e74631eba3398cd5d4cb8da Author: Stephen Herr Date: Wed Dec 5 15:23:00 2012 -0500 Revert "883546 - repodata inconsistency due to concurrent modification" = This reverts commit 165189729784f9134f5bd9d5090df2f9588eff54. diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Task_que= ries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Task_queri= es.xml index f75d967..fa1de80 100644 --- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Task_queries.xml +++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Task_queries.xml @@ -606,11 +606,12 @@ where rhnChannelErrata.errata_id =3D rhnErrataPackage= .errata_id SELECT chpkg.package_id, pkgcap.id, pkgcap.name, pkgcap.version FROM rhnPackageFile pkgf, rhnPackageCapability pkgcap, - rhnChannelPackage chpkg + rhnChannelPackage chpkg left join rhnPackageRepodata prd ON prd.= package_id =3D chpkg.package_id WHERE chpkg.package_id =3D pkgf.package_id AND pkgf.capability_id =3D pkgcap.id AND chpkg.channel_id =3D :channel_id + AND prd.primary_xml is null ORDER BY pkgf.package_id @@ -619,11 +620,12 @@ where rhnChannelErrata.errata_id =3D rhnErrataPackage= .errata_id SELECT chpkg.package_id, pkgcap.id, pkgcap.name, pkgcap.version, pkgp.se= nse FROM rhnPackageProvides pkgp, rhnPackageCapability pkgcap, - rhnChannelPackage chpkg + rhnChannelPackage chpkg left join rhnPackageRepodata prd ON prd.pack= age_id =3D chpkg.package_id WHERE chpkg.package_id =3D pkgp.package_id AND pkgp.capability_id =3D pkgcap.id AND chpkg.channel_id =3D :channel_id + AND prd.primary_xml is null ORDER BY pkgp.package_id @@ -632,11 +634,12 @@ where rhnChannelErrata.errata_id =3D rhnErrataPackage= .errata_id SELECT chpkg.package_id, pkgcap.id, pkgcap.name, pkgcap.version, pkgp.se= nse FROM rhnPackageRequires pkgp, rhnPackageCapability pkgcap, - rhnChannelPackage chpkg + rhnChannelPackage chpkg left join rhnPackageRepodata prd ON prd.pack= age_id =3D chpkg.package_id WHERE chpkg.package_id =3D pkgp.package_id AND pkgp.capability_id =3D pkgcap.id AND chpkg.channel_id =3D :channel_id + AND prd.primary_xml is null ORDER BY pkgp.package_id @@ -645,11 +648,12 @@ where rhnChannelErrata.errata_id =3D rhnErrataPackage= .errata_id SELECT chpkg.package_id, pkgcap.id, pkgcap.name, pkgcap.version, pkgp.se= nse FROM rhnPackageConflicts pkgp, rhnPackageCapability pkgcap, - rhnChannelPackage chpkg + rhnChannelPackage chpkg left join rhnPackageRepodata prd ON prd.pack= age_id =3D chpkg.package_id WHERE chpkg.package_id =3D pkgp.package_id AND pkgp.capability_id =3D pkgcap.id AND chpkg.channel_id =3D :channel_id + AND prd.primary_xml is null ORDER BY pkgp.package_id @@ -658,11 +662,12 @@ where rhnChannelErrata.errata_id =3D rhnErrataPackage= .errata_id SELECT chpkg.package_id, pkgcap.id, pkgcap.name, pkgcap.version, pkgp.se= nse FROM rhnPackageObsoletes pkgp, rhnPackageCapability pkgcap, - rhnChannelPackage chpkg + rhnChannelPackage chpkg left join rhnPackageRepodata prd ON prd.pack= age_id =3D chpkg.package_id WHERE chpkg.package_id =3D pkgp.package_id AND pkgp.capability_id =3D pkgcap.id AND chpkg.channel_id =3D :channel_id + AND prd.primary_xml is null ORDER BY pkgp.package_id @@ -671,11 +676,12 @@ where rhnChannelErrata.errata_id =3D rhnErrataPackage= .errata_id SELECT chpkg.package_id, pkgcap.id, pkgcap.name, pkgcap.version, pkgp.se= nse FROM rhnPackageRecommends pkgp, rhnPackageCapability pkgcap, - rhnChannelPackage chpkg + rhnChannelPackage chpkg left join rhnPackageRepodata prd ON prd.= package_id =3D chpkg.package_id WHERE chpkg.package_id =3D pkgp.package_id AND pkgp.capability_id =3D pkgcap.id AND chpkg.channel_id =3D :channel_id + AND prd.primary_xml is null ORDER BY pkgp.package_id @@ -684,11 +690,12 @@ where rhnChannelErrata.errata_id =3D rhnErrataPackage= .errata_id SELECT chpkg.package_id, pkgcap.id, pkgcap.name, pkgcap.version, pkgp.se= nse FROM rhnPackageSuggests pkgp, rhnPackageCapability pkgcap, - rhnChannelPackage chpkg + rhnChannelPackage chpkg left join rhnPackageRepodata prd ON prd.= package_id =3D chpkg.package_id WHERE chpkg.package_id =3D pkgp.package_id AND pkgp.capability_id =3D pkgcap.id AND chpkg.channel_id =3D :channel_id + AND prd.primary_xml is null ORDER BY pkgp.package_id @@ -697,11 +704,12 @@ where rhnChannelErrata.errata_id =3D rhnErrataPackage= .errata_id SELECT chpkg.package_id, pkgcap.id, pkgcap.name, pkgcap.version, pkgp.se= nse FROM rhnPackageSupplements pkgp, rhnPackageCapability pkgcap, - rhnChannelPackage chpkg + rhnChannelPackage chpkg left join rhnPackageRepodata prd ON prd.= package_id =3D chpkg.package_id WHERE chpkg.package_id =3D pkgp.package_id AND pkgp.capability_id =3D pkgcap.id AND chpkg.channel_id =3D :channel_id + AND prd.primary_xml is null ORDER BY pkgp.package_id --===============3634965917104912178==-- From sherr at fedoraproject.org Thu Aug 20 12:13:39 2015 Content-Type: multipart/mixed; boundary="===============1951399376498731151==" MIME-Version: 1.0 From: StephenHerr To: spacewalk-commits at lists.fedorahosted.org Subject: java/code Date: Thu, 06 Dec 2012 21:33:49 +0000 Message-ID: <20121206213349.3E996A0C59@fedorahosted.org> --===============1951399376498731151== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/common/db/datasource/xml/Task_queries.xml = | 158 +++---- java/code/src/com/redhat/rhn/frontend/dto/PackageCapabilityDto.java = | 87 ++++ java/code/src/com/redhat/rhn/frontend/dto/PackageChangelogDto.java = | 89 ++++ java/code/src/com/redhat/rhn/manager/task/TaskManager.java = | 32 + java/code/src/com/redhat/rhn/taskomatic/task/repomd/DebPackageWriter.java = | 56 +- java/code/src/com/redhat/rhn/taskomatic/task/repomd/FilelistsXmlWriter.jav= a | 18 = java/code/src/com/redhat/rhn/taskomatic/task/repomd/OtherXmlWriter.java = | 21 - java/code/src/com/redhat/rhn/taskomatic/task/repomd/PackageCapabilityItera= tor.java | 202 ---------- java/code/src/com/redhat/rhn/taskomatic/task/repomd/PrimaryXmlWriter.java = | 91 +--- java/code/src/com/redhat/rhn/taskomatic/task/repomd/RepomdWriter.java = | 6 = java/code/src/com/redhat/rhn/taskomatic/task/repomd/RpmRepositoryWriter.ja= va | 12 = java/code/src/com/redhat/rhn/taskomatic/task/repomd/UpdateInfoWriter.java = | 21 - 12 files changed, 376 insertions(+), 417 deletions(-) New commits: commit a5e6dad5668f09a998b497d5d61ce44df5690509 Author: Stephen Herr Date: Thu Dec 6 16:07:35 2012 -0500 883546 - reworking how repodata xml gets built to avoid "snapshot too o= ld" errors diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Task_que= ries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Task_queri= es.xml index fa1de80..c73ad00 100644 --- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Task_queries.xml +++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Task_queries.xml @@ -602,126 +602,92 @@ where rhnChannelErrata.errata_id =3D rhnErrataPackag= e.errata_id = - - - SELECT chpkg.package_id, pkgcap.id, pkgcap.name, pkgcap.version - FROM rhnPackageFile pkgf, rhnPackageCapability pkgcap, - rhnChannelPackage chpkg left join rhnPackageRepodata prd ON prd.= package_id =3D chpkg.package_id - WHERE - chpkg.package_id =3D pkgf.package_id - AND pkgf.capability_id =3D pkgcap.id - AND chpkg.channel_id =3D :channel_id - AND prd.primary_xml is null - ORDER BY pkgf.package_id + + + SELECT pkgcap.id, pkgcap.name, pkgcap.version + FROM rhnPackageFile pkgf, rhnPackageCapability pkgcap + WHERE pkgf.capability_id =3D pkgcap.id + AND pkgf.package_id =3D :package_id = - - - SELECT chpkg.package_id, pkgcap.id, pkgcap.name, pkgcap.version, pkgp.se= nse - FROM rhnPackageProvides pkgp, rhnPackageCapability pkgcap, - rhnChannelPackage chpkg left join rhnPackageRepodata prd ON prd.pack= age_id =3D chpkg.package_id - WHERE - chpkg.package_id =3D pkgp.package_id - AND pkgp.capability_id =3D pkgcap.id - AND chpkg.channel_id =3D :channel_id - AND prd.primary_xml is null - ORDER BY pkgp.package_id + + + SELECT pkgcap.id, pkgcap.name, pkgcap.version, pkgp.sense + FROM rhnPackageProvides pkgp, rhnPackageCapability pkgcap + WHERE pkgp.capability_id =3D pkgcap.id + AND pkgp.package_id =3D :package_id = - - - SELECT chpkg.package_id, pkgcap.id, pkgcap.name, pkgcap.version, pkgp.se= nse - FROM rhnPackageRequires pkgp, rhnPackageCapability pkgcap, - rhnChannelPackage chpkg left join rhnPackageRepodata prd ON prd.pack= age_id =3D chpkg.package_id - WHERE - chpkg.package_id =3D pkgp.package_id - AND pkgp.capability_id =3D pkgcap.id - AND chpkg.channel_id =3D :channel_id - AND prd.primary_xml is null - ORDER BY pkgp.package_id + + + SELECT pkgcap.id, pkgcap.name, pkgcap.version, pkgp.sense + FROM rhnPackageRequires pkgp, rhnPackageCapability pkgcap + WHERE pkgp.capability_id =3D pkgcap.id + AND pkgp.package_id =3D :package_id = - - - SELECT chpkg.package_id, pkgcap.id, pkgcap.name, pkgcap.version, pkgp.se= nse - FROM rhnPackageConflicts pkgp, rhnPackageCapability pkgcap, - rhnChannelPackage chpkg left join rhnPackageRepodata prd ON prd.pack= age_id =3D chpkg.package_id - WHERE - chpkg.package_id =3D pkgp.package_id - AND pkgp.capability_id =3D pkgcap.id - AND chpkg.channel_id =3D :channel_id - AND prd.primary_xml is null - ORDER BY pkgp.package_id + + + SELECT pkgcap.id, pkgcap.name, pkgcap.version, pkgp.sense + FROM rhnPackageConflicts pkgp, rhnPackageCapability pkgcap + WHERE pkgp.capability_id =3D pkgcap.id + AND pkgp.package_id =3D :package_id = - - - SELECT chpkg.package_id, pkgcap.id, pkgcap.name, pkgcap.version, pkgp.se= nse - FROM rhnPackageObsoletes pkgp, rhnPackageCapability pkgcap, - rhnChannelPackage chpkg left join rhnPackageRepodata prd ON prd.pack= age_id =3D chpkg.package_id - WHERE - chpkg.package_id =3D pkgp.package_id - AND pkgp.capability_id =3D pkgcap.id - AND chpkg.channel_id =3D :channel_id - AND prd.primary_xml is null - ORDER BY pkgp.package_id + + + SELECT pkgcap.id, pkgcap.name, pkgcap.version, pkgp.sense + FROM rhnPackageObsoletes pkgp, rhnPackageCapability pkgcap + WHERE pkgp.capability_id =3D pkgcap.id + AND pkgp.package_id =3D :package_id = - - - SELECT chpkg.package_id, pkgcap.id, pkgcap.name, pkgcap.version, pkgp.se= nse - FROM rhnPackageRecommends pkgp, rhnPackageCapability pkgcap, - rhnChannelPackage chpkg left join rhnPackageRepodata prd ON prd.= package_id =3D chpkg.package_id - WHERE - chpkg.package_id =3D pkgp.package_id - AND pkgp.capability_id =3D pkgcap.id - AND chpkg.channel_id =3D :channel_id - AND prd.primary_xml is null - ORDER BY pkgp.package_id + + + SELECT pkgcap.id, pkgcap.name, pkgcap.version, pkgp.sense + FROM rhnPackageRecommends pkgp, rhnPackageCapability pkgcap + WHERE pkgp.capability_id =3D pkgcap.id + AND pkgp.package_id =3D :package_id = - - - SELECT chpkg.package_id, pkgcap.id, pkgcap.name, pkgcap.version, pkgp.se= nse - FROM rhnPackageSuggests pkgp, rhnPackageCapability pkgcap, - rhnChannelPackage chpkg left join rhnPackageRepodata prd ON prd.= package_id =3D chpkg.package_id - WHERE - chpkg.package_id =3D pkgp.package_id - AND pkgp.capability_id =3D pkgcap.id - AND chpkg.channel_id =3D :channel_id - AND prd.primary_xml is null - ORDER BY pkgp.package_id + + + SELECT pkgcap.id, pkgcap.name, pkgcap.version, pkgp.sense + FROM rhnPackageSuggests pkgp, rhnPackageCapability pkgcap + WHERE pkgp.capability_id =3D pkgcap.id + AND pkgp.package_id =3D :package_id = - - - SELECT chpkg.package_id, pkgcap.id, pkgcap.name, pkgcap.version, pkgp.se= nse - FROM rhnPackageSupplements pkgp, rhnPackageCapability pkgcap, - rhnChannelPackage chpkg left join rhnPackageRepodata prd ON prd.= package_id =3D chpkg.package_id - WHERE - chpkg.package_id =3D pkgp.package_id - AND pkgp.capability_id =3D pkgcap.id - AND chpkg.channel_id =3D :channel_id - AND prd.primary_xml is null - ORDER BY pkgp.package_id + + + SELECT pkgcap.id, pkgcap.name, pkgcap.version, pkgp.sense + FROM rhnPackageSupplements pkgp, rhnPackageCapability pkgcap + WHERE pkgp.capability_id =3D pkgcap.id + AND pkgp.package_id =3D :package_id = - - - SELECT chpkg.package_id, pkglog.time, pkglog.name as author, pkglog.text - FROM rhnPackageChangeLog pkglog, rhnChannelPackage chpkg - WHERE - chpkg.package_id =3D pkglog.package_id - AND chpkg.channel_id =3D :channel_id - ORDER BY pkglog.package_id + + + SELECT pkglog.time, pkglog.name as author, pkglog.text + FROM rhnPackageChangeLog pkglog + WHERE pkglog.package_id =3D :package_id = diff --git a/java/code/src/com/redhat/rhn/frontend/dto/PackageCapabilityDto= .java b/java/code/src/com/redhat/rhn/frontend/dto/PackageCapabilityDto.java new file mode 100644 index 0000000..2d3c4dc --- /dev/null +++ b/java/code/src/com/redhat/rhn/frontend/dto/PackageCapabilityDto.java @@ -0,0 +1,87 @@ +/** + * Copyright (c) 2009--2011 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. + */ +package com.redhat.rhn.frontend.dto; + +/** + * PackageCapabilityDto + * @version $Rev$ + * + * DTO for a specific set of package capability data returned from some da= ta source + * package queries. + */ +public class PackageCapabilityDto extends BaseDto { + + private Long id; + private String name; + private String version; + private Long sense; + + + /** + * @return the id + */ + public Long getId() { + return id; + } + + /** + * @param idIn the id to set + */ + public void setId(Long idIn) { + this.id =3D idIn; + } + + /** + * @return the name + */ + public String getName() { + return name; + } + + /** + * @param nameIn the name to set + */ + public void setName(String nameIn) { + this.name =3D nameIn; + } + + /** + * @return the version + */ + public String getVersion() { + return version; + } + + /** + * @param versionIn the version to set + */ + public void setVersion(String versionIn) { + this.version =3D versionIn; + } + + /** + * @return the sense + */ + public Long getSense() { + return sense; + } + + /** + * @param senseIn the release to set + */ + public void setSense(Long senseIn) { + this.sense =3D senseIn; + } +} diff --git a/java/code/src/com/redhat/rhn/frontend/dto/PackageChangelogDto.= java b/java/code/src/com/redhat/rhn/frontend/dto/PackageChangelogDto.java new file mode 100644 index 0000000..d6a478b --- /dev/null +++ b/java/code/src/com/redhat/rhn/frontend/dto/PackageChangelogDto.java @@ -0,0 +1,89 @@ +/** + * Copyright (c) 2009--2011 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. + */ +package com.redhat.rhn.frontend.dto; + +import java.sql.Timestamp; + +/** + * PackageChangelogDto + * @version $Rev$ + * + * DTO for a specific set of package capability data returned from some da= ta source + * package queries. + */ +public class PackageChangelogDto extends BaseDto { + + private Long id; + private String author; + private String text; + private Timestamp time; + + + /** + * @return the id + */ + public Long getId() { + return id; + } + + /** + * @param idIn the id to set + */ + public void setId(Long idIn) { + this.id =3D idIn; + } + + /** + * @return the author + */ + public String getAuthor() { + return author; + } + + /** + * @param authorIn the author to set + */ + public void setAuthor(String authorIn) { + this.author =3D authorIn; + } + + /** + * @return the text + */ + public String getText() { + return text; + } + + /** + * @param textIn the text to set + */ + public void setText(String textIn) { + this.text =3D textIn; + } + + /** + * @return the time + */ + public Timestamp getTime() { + return time; + } + + /** + * @param timeIn the time to set + */ + public void setTime(Timestamp timeIn) { + this.time =3D timeIn; + } +} diff --git a/java/code/src/com/redhat/rhn/manager/task/TaskManager.java b/j= ava/code/src/com/redhat/rhn/manager/task/TaskManager.java index 75f7d98..f1d94b5 100644 --- a/java/code/src/com/redhat/rhn/manager/task/TaskManager.java +++ b/java/code/src/com/redhat/rhn/manager/task/TaskManager.java @@ -18,6 +18,8 @@ import com.redhat.rhn.common.db.datasource.DataResult; import com.redhat.rhn.common.db.datasource.ModeFactory; import com.redhat.rhn.common.db.datasource.SelectMode; import com.redhat.rhn.domain.channel.Channel; +import com.redhat.rhn.frontend.dto.PackageCapabilityDto; +import com.redhat.rhn.frontend.dto.PackageChangelogDto; import com.redhat.rhn.frontend.dto.PackageDto; import com.redhat.rhn.taskomatic.task.TaskConstants; = @@ -45,12 +47,40 @@ public class TaskManager { public static Collection getChannelPackageDtos(Channel cha= nnel) { SelectMode m =3D ModeFactory.getMode(TaskConstants.MODE_NAME, TaskConstants.TASK_QUERY_REPOMD_GENERATOR_CHANNEL_PACKAGES= ); - Map params =3D new HashMap(); + Map params =3D new HashMap(); params.put("channel_id", channel.getId()); return m.execute(params); } = /** + * Get capabilities of a certain type for a package + * @param packageId the package's id + * @param query the query to execute + * @return a collection of capabilities + */ + public static Collection getPackageCapabilityDto= s( + Long packageId, String query) { + SelectMode m =3D ModeFactory.getMode(TaskConstants.MODE_NAME, quer= y); + Map params =3D new HashMap(); + params.put("package_id", packageId); + return m.execute(params); + } + + /** + * Get changelog entries for a particular package + * @param packageId the package's id + * @return a collection of changelogs + */ + public static Collection getPackageChangelogDtos( + Long packageId) { + SelectMode m =3D ModeFactory.getMode(TaskConstants.MODE_NAME, + TaskConstants.TASK_QUERY_REPOMD_GENERATOR_PACKAGE_CHANGELO= G); + Map params =3D new HashMap(); + params.put("package_id", packageId); + return m.execute(params); + } + + /** * Return task status info * @return task status info */ diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/repomd/DebPackage= Writer.java b/java/code/src/com/redhat/rhn/taskomatic/task/repomd/DebPackag= eWriter.java index e177eec..08fafb4 100644 --- a/java/code/src/com/redhat/rhn/taskomatic/task/repomd/DebPackageWriter.= java +++ b/java/code/src/com/redhat/rhn/taskomatic/task/repomd/DebPackageWriter.= java @@ -15,7 +15,9 @@ package com.redhat.rhn.taskomatic.task.repomd; = import com.redhat.rhn.domain.channel.Channel; +import com.redhat.rhn.frontend.dto.PackageCapabilityDto; import com.redhat.rhn.frontend.dto.PackageDto; +import com.redhat.rhn.manager.task.TaskManager; import com.redhat.rhn.taskomatic.task.TaskConstants; = import org.apache.log4j.Logger; @@ -26,6 +28,7 @@ import java.io.IOException; import java.io.File; import java.io.FileWriter; import java.io.BufferedWriter; +import java.util.Collection; import java.util.zip.GZIPOutputStream; = /** @@ -38,10 +41,6 @@ public class DebPackageWriter { private static Logger log =3D Logger.getLogger(DebPackageWriter.class); private String filenamePackages =3D ""; private String channelLabel =3D ""; - private PackageCapabilityIterator providesIterator; - private PackageCapabilityIterator requiresIterator; - private PackageCapabilityIterator conflictsIterator; - private PackageCapabilityIterator obsoletesIterator; = /** * @@ -58,19 +57,6 @@ public class DebPackageWriter { f.delete(); } f.createNewFile(); - - providesIterator =3D new PackageCapabilityIterator( - channel, - TaskConstants.TASK_QUERY_REPOMD_GENERATOR_CAPABILITY_P= ROVIDES); - requiresIterator =3D new PackageCapabilityIterator( - channel, - TaskConstants.TASK_QUERY_REPOMD_GENERATOR_CAPABILITY_R= EQUIRES); - conflictsIterator =3D new PackageCapabilityIterator( - channel, - TaskConstants.TASK_QUERY_REPOMD_GENERATOR_CAPABILITY_C= ONFLICTS); - obsoletesIterator =3D new PackageCapabilityIterator( - channel, - TaskConstants.TASK_QUERY_REPOMD_GENERATOR_CAPABILITY_O= BSOLETES); } catch (Exception e) { log.debug("Create file Packages failed " + e.toString()); @@ -112,14 +98,22 @@ public class DebPackageWriter { out.newLine(); = // dependencies - addPackageDepData(out, providesIterator, - pkgDto.getId().longValue(), "Provides"); - addPackageDepData(out, requiresIterator, - pkgDto.getId().longValue(), "Depends"); - addPackageDepData(out, conflictsIterator, pkgDto.getId() - .longValue(), "Conflicts"); - addPackageDepData(out, obsoletesIterator, pkgDto.getId() - .longValue(), "Replaces"); + addPackageDepData( + out, + TaskConstants.TASK_QUERY_REPOMD_GENERATOR_CAPABILITY_P= ROVIDES, + pkgDto.getId(), "Provides"); + addPackageDepData( + out, + TaskConstants.TASK_QUERY_REPOMD_GENERATOR_CAPABILITY_R= EQUIRES, + pkgDto.getId(), "Depends"); + addPackageDepData( + out, + TaskConstants.TASK_QUERY_REPOMD_GENERATOR_CAPABILITY_C= ONFLICTS, + pkgDto.getId(), "Conflicts"); + addPackageDepData( + out, + TaskConstants.TASK_QUERY_REPOMD_GENERATOR_CAPABILITY_O= BSOLETES, + pkgDto.getId(), "Replaces"); = out.write("Filename: XMLRPC/GET-REQ/" + channelLabel + "/getPa= ckage/" + pkgDto.getName() + "-" + pkgDto.getVersion() + "-" + @@ -187,11 +181,13 @@ public class DebPackageWriter { * @param dep * dependency info */ - private void addPackageDepData(BufferedWriter out, - PackageCapabilityIterator pkgCapIter, long pkgId, String dep) { + private void addPackageDepData(BufferedWriter out, String query, + Long pkgId, String dep) { int count =3D 0; + Collection capabilities =3D TaskManager + .getPackageCapabilityDtos(pkgId, query); try { - while (pkgCapIter.hasNextForPackage(pkgId)) { + for (PackageCapabilityDto capability : capabilities) { if (count =3D=3D 0) { out.write(dep + ": "); } @@ -199,8 +195,8 @@ public class DebPackageWriter { out.write(", "); } count++; - String name =3D pkgCapIter.getString("name"); - String version =3D pkgCapIter.getString("version"); + String name =3D capability.getName(); + String version =3D capability.getVersion(); out.write(name); if (version !=3D null && !version.isEmpty()) { out.write(" (" + version + ")"); diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/repomd/FilelistsX= mlWriter.java b/java/code/src/com/redhat/rhn/taskomatic/task/repomd/Filelis= tsXmlWriter.java index 0f07702..6ac62c9 100644 --- a/java/code/src/com/redhat/rhn/taskomatic/task/repomd/FilelistsXmlWrite= r.java +++ b/java/code/src/com/redhat/rhn/taskomatic/task/repomd/FilelistsXmlWrite= r.java @@ -17,6 +17,7 @@ package com.redhat.rhn.taskomatic.task.repomd; = import com.redhat.rhn.common.conf.ConfigDefaults; import com.redhat.rhn.domain.channel.Channel; +import com.redhat.rhn.frontend.dto.PackageCapabilityDto; import com.redhat.rhn.frontend.dto.PackageDto; import com.redhat.rhn.manager.rhnpackage.PackageManager; import com.redhat.rhn.manager.task.TaskManager; @@ -28,6 +29,7 @@ import org.xml.sax.SAXException; import java.io.ByteArrayOutputStream; import java.io.OutputStream; import java.io.Writer; +import java.util.Collection; = /** * @@ -36,8 +38,6 @@ import java.io.Writer; */ public class FilelistsXmlWriter extends RepomdWriter { = - private PackageCapabilityIterator filelistIterator; - /** * * @param writer The writer object for filelist xml @@ -84,8 +84,6 @@ public class FilelistsXmlWriter extends RepomdWriter { * @param channel channel info */ public void begin(Channel channel) { - filelistIterator =3D new PackageCapabilityIterator(channel, - TaskConstants.TASK_QUERY_REPOMD_GENERATOR_CAPABILITY_FILES= ); SimpleAttributesImpl attr =3D new SimpleAttributesImpl(); attr.addAttribute("xmlns", "http://linux.duke.edu/metadata/filelis= ts"); attr.addAttribute("packages", Integer.toString(channel.getPackageC= ount())); @@ -140,10 +138,14 @@ public class FilelistsXmlWriter extends RepomdWriter { */ private void addPackageFiles(PackageDto pkgDto, SimpleContentHandler localHandler) throws SAXException { - long pkgId =3D pkgDto.getId().longValue(); - while (filelistIterator.hasNextForPackage(pkgId)) { - localHandler.addElementWithCharacters("file", sanitize(pkgId, - filelistIterator.getString("name"))); + Long pkgId =3D pkgDto.getId(); + Collection files =3D TaskManager + .getPackageCapabilityDtos( + pkgId, + TaskConstants.TASK_QUERY_REPOMD_GENERATOR_CAPABILI= TY_FILES); + for (PackageCapabilityDto file : files) { + localHandler.addElementWithCharacters("file", + sanitize(pkgId, file.getName())); } } = diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/repomd/OtherXmlWr= iter.java b/java/code/src/com/redhat/rhn/taskomatic/task/repomd/OtherXmlWri= ter.java index c39a11a..49ad7ee 100644 --- a/java/code/src/com/redhat/rhn/taskomatic/task/repomd/OtherXmlWriter.ja= va +++ b/java/code/src/com/redhat/rhn/taskomatic/task/repomd/OtherXmlWriter.ja= va @@ -17,11 +17,10 @@ package com.redhat.rhn.taskomatic.task.repomd; import com.redhat.rhn.common.conf.ConfigDefaults; import com.redhat.rhn.common.translation.SqlExceptionTranslator; import com.redhat.rhn.domain.channel.Channel; +import com.redhat.rhn.frontend.dto.PackageChangelogDto; import com.redhat.rhn.frontend.dto.PackageDto; import com.redhat.rhn.manager.rhnpackage.PackageManager; import com.redhat.rhn.manager.task.TaskManager; -import com.redhat.rhn.taskomatic.task.TaskConstants; - import org.apache.commons.lang.StringUtils; import org.xml.sax.SAXException; = @@ -29,6 +28,7 @@ import java.io.ByteArrayOutputStream; import java.io.OutputStream; import java.io.Writer; import java.sql.SQLException; +import java.util.Collection; = /** * @@ -37,7 +37,6 @@ import java.sql.SQLException; */ public class OtherXmlWriter extends RepomdWriter { = - private PackageCapabilityIterator changeLogIterator; /** * * @param writer The writer object for other.xml @@ -70,8 +69,6 @@ public class OtherXmlWriter extends RepomdWriter { * @param channel channel info */ public void begin(Channel channel) { - changeLogIterator =3D new PackageCapabilityIterator(channel, - TaskConstants.TASK_QUERY_REPOMD_GENERATOR_PACKAGE_CHANGELO= G); SimpleAttributesImpl attr =3D new SimpleAttributesImpl(); attr.addAttribute("xmlns", "http://linux.duke.edu/metadata/other"); attr.addAttribute("packages", Integer.toString(channel.getPackageC= ount())); @@ -143,14 +140,16 @@ public class OtherXmlWriter extends RepomdWriter { private void addPackageChangelog(PackageDto pkgDto, SimpleContentHandler tmpHandler) throws SAXException, SQLExcep= tion { = - long pkgId =3D pkgDto.getId().longValue(); - while (changeLogIterator.hasNextForPackage(pkgId)) { - String author =3D changeLogIterator.getString("author"); - String text =3D changeLogIterator.getString("text"); + Long pkgId =3D pkgDto.getId(); + Collection changelogEntries =3D TaskManager + .getPackageChangelogDtos(pkgId); + for (PackageChangelogDto changelogEntry : changelogEntries) { + String author =3D changelogEntry.getAuthor(); + String text =3D changelogEntry.getText(); SimpleAttributesImpl attr =3D new SimpleAttributesImpl(); attr.addAttribute("author", sanitize(pkgId, author)); - attr.addAttribute("date", Long.toString(changeLogIterator.getD= ate( - "time").getTime() / 1000)); + attr.addAttribute("date", + Long.toString(changelogEntry.getTime().getTime() / 100= 0)); tmpHandler.startElement("changelog", attr); tmpHandler.addCharacters(sanitize(pkgId, text)); tmpHandler.endElement("changelog"); diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/repomd/PackageCap= abilityIterator.java b/java/code/src/com/redhat/rhn/taskomatic/task/repomd/= PackageCapabilityIterator.java deleted file mode 100644 index cd717c4..0000000 --- a/java/code/src/com/redhat/rhn/taskomatic/task/repomd/PackageCapability= Iterator.java +++ /dev/null @@ -1,202 +0,0 @@ -/** - * Copyright (c) 2009--2012 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. - */ -package com.redhat.rhn.taskomatic.task.repomd; - -import com.redhat.rhn.common.db.NamedPreparedStatement; -import com.redhat.rhn.common.db.datasource.ModeFactory; -import com.redhat.rhn.common.db.datasource.SelectMode; -import com.redhat.rhn.common.hibernate.HibernateFactory; -import com.redhat.rhn.domain.channel.Channel; -import com.redhat.rhn.taskomatic.task.TaskConstants; - -import org.apache.log4j.Logger; - -import java.math.BigDecimal; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.ResultSetMetaData; -import java.sql.SQLException; -import java.util.Date; -import java.util.HashMap; -import java.util.Map; - -/** - * - * @version $Rev $ - * - */ -public class PackageCapabilityIterator { - - private static Logger log =3D Logger - .getLogger(PackageCapabilityIterator.class); - private static final String PACKAGE_ID =3D "package_id"; - - private String queryName; - private ResultSet rs; - private ResultSetMetaData rsmd; - private Map row; - private boolean goBack; - private boolean hasMoreRows; - - /** - * - * @param ch channel - * @param queryNameIn query name - */ - public PackageCapabilityIterator(Channel ch, String queryNameIn) { - queryName =3D queryNameIn; - // The following usage of SelectMode is only to fetch the named qu= ery - // from the .xml - // file and to replace the bind parameters. We will execute the qu= ery - // through raw - // JDBC since we don't want to keep few million rows of data in me= mory. - SelectMode modeIn =3D ModeFactory.getMode(TaskConstants.MODE_NAME, - queryName); - String query =3D NamedPreparedStatement.replaceBindParams(modeIn.g= etQuery() - .getOrigQuery(), new HashMap()); - - row =3D new HashMap(); - goBack =3D false; - hasMoreRows =3D true; - try { - PreparedStatement ps =3D HibernateFactory.getSession().connect= ion() - .prepareStatement(query); - ps.setLong(1, ch.getId()); - ps.setFetchSize(200); - rs =3D ps.executeQuery(); - rsmd =3D rs.getMetaData(); - } - catch (SQLException sqle) { - log.error("SQLexception", sqle); - } - } - - /** - * - * @param pkgId package Id - * @return Returns the next pkg in the sequence - */ - public boolean hasNextForPackage(long pkgId) { - if (!next()) { - return false; - } - long current =3D getPkgId(); - if (current =3D=3D pkgId) { - // We're still on the requested package - return true; - } - if (current > pkgId) { - // We've past the package boundary, and have already fetched o= ne row - // from the next package. Please put it back. - goBack =3D true; - return false; - } - // At this point we know that we still haven't reached our package. - // Perform a seek() to the point where our package starts. - while (current < pkgId) { - if (!next()) { - return false; - } - current =3D getPkgId(); - } - // If no rows can be found for the requested package, return false. - return current =3D=3D pkgId; - } - - /** - * - * @param key as string - * @return key as string - */ - public String getString(String key) { - return (String) row.get(key.toLowerCase()); - } - - /** - * - * @param key key as string - * @return key as bigDecimal number - */ - public BigDecimal getNumber(String key) { - return (BigDecimal) row.get(key.toLowerCase()); - } - - /** - * - * @param key key as string - * @return key as date - * @throws SQLException sql exception - */ - public Date getDate(String key) throws SQLException { - return rs.getTimestamp(key.toLowerCase()); - } - - /** - * - * @return package Id - */ - private long getPkgId() { - return Long.valueOf(row.get(PACKAGE_ID).toString()); - } - - /** - * - * @return next element in the row - */ - private boolean next() { - if (!hasMoreRows) { - return false; - } - if (goBack) { - goBack =3D false; - return true; - } - hasMoreRows =3D false; - try { - hasMoreRows =3D rs.next(); - } - catch (SQLException sqle) { - log.error("SQLexception", sqle); - } - if (hasMoreRows) { - storeRow(); - } - else { - // in case iterator has no rows at all, row.get(PACKAGE_ID) wo= uld - // return null, - // so we can't use getPkgId() - log.debug("End of resultset for " + queryName + ", " + - "last package seen: " + row.get(PACKAGE_ID)); - } - return hasMoreRows; - } - - /** - * stores the elements to the row object - */ - private void storeRow() { - try { - for (int i =3D 1; i <=3D rsmd.getColumnCount(); i++) { - Object obj =3D rs.getObject(i); - String column =3D rsmd.getColumnName(i); - row.put(column.toLowerCase(), obj); - } - } - catch (SQLException sqle) { - log.error("SQLexception", sqle); - } - } - -} diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/repomd/PrimaryXml= Writer.java b/java/code/src/com/redhat/rhn/taskomatic/task/repomd/PrimaryXm= lWriter.java index ac20ec8..512520b 100644 --- a/java/code/src/com/redhat/rhn/taskomatic/task/repomd/PrimaryXmlWriter.= java +++ b/java/code/src/com/redhat/rhn/taskomatic/task/repomd/PrimaryXmlWriter.= java @@ -17,6 +17,7 @@ package com.redhat.rhn.taskomatic.task.repomd; = import com.redhat.rhn.common.conf.ConfigDefaults; import com.redhat.rhn.domain.channel.Channel; +import com.redhat.rhn.frontend.dto.PackageCapabilityDto; import com.redhat.rhn.frontend.dto.PackageDto; import com.redhat.rhn.manager.rhnpackage.PackageManager; import com.redhat.rhn.manager.task.TaskManager; @@ -27,6 +28,7 @@ import org.xml.sax.SAXException; = import java.io.ByteArrayOutputStream; import java.io.Writer; +import java.util.Collection; import java.util.HashMap; import java.util.Map; = @@ -37,14 +39,6 @@ import java.util.Map; */ public class PrimaryXmlWriter extends RepomdWriter { = - private PackageCapabilityIterator filesIterator; - private PackageCapabilityIterator providesIterator; - private PackageCapabilityIterator requiresIterator; - private PackageCapabilityIterator conflictsIterator; - private PackageCapabilityIterator obsoletesIterator; - private PackageCapabilityIterator recommendsIterator; - private PackageCapabilityIterator suggestsIterator; - private PackageCapabilityIterator supplementsIterator; /** * * @param writer The writer object for primary xml @@ -89,22 +83,6 @@ public class PrimaryXmlWriter extends RepomdWriter { * @param channel channel data */ public void begin(Channel channel) { - filesIterator =3D new PackageCapabilityIterator(channel, - TaskConstants.TASK_QUERY_REPOMD_GENERATOR_CAPABILITY_FILES= ); - providesIterator =3D new PackageCapabilityIterator(channel, - TaskConstants.TASK_QUERY_REPOMD_GENERATOR_CAPABILITY_PROVI= DES); - requiresIterator =3D new PackageCapabilityIterator(channel, - TaskConstants.TASK_QUERY_REPOMD_GENERATOR_CAPABILITY_REQUI= RES); - conflictsIterator =3D new PackageCapabilityIterator(channel, - TaskConstants.TASK_QUERY_REPOMD_GENERATOR_CAPABILITY_CONFL= ICTS); - obsoletesIterator =3D new PackageCapabilityIterator(channel, - TaskConstants.TASK_QUERY_REPOMD_GENERATOR_CAPABILITY_OBSOL= ETES); - recommendsIterator =3D new PackageCapabilityIterator(channel, - TaskConstants.TASK_QUERY_REPOMD_GENERATOR_CAPABILITY_RECOM= MENDS); - suggestsIterator =3D new PackageCapabilityIterator(channel, - TaskConstants.TASK_QUERY_REPOMD_GENERATOR_CAPABILITY_SUGGE= STS); - supplementsIterator =3D new PackageCapabilityIterator(channel, - TaskConstants.TASK_QUERY_REPOMD_GENERATOR_CAPABILITY_SUPPL= EMENTS); SimpleAttributesImpl attr =3D new SimpleAttributesImpl(); attr.addAttribute("xmlns", "http://linux.duke.edu/metadata/common"= ); attr.addAttribute("xmlns:rpm", "http://linux.duke.edu/metadata/rpm= "); @@ -264,21 +242,28 @@ public class PrimaryXmlWriter extends RepomdWriter { */ private void addPackagePrcoData(PackageDto pkgDto, SimpleContentHandler localHandler) throws SAXException { - addPackageDepData(providesIterator, pkgDto.getId().longValue(), - "provides", localHandler); - addPackageDepData(requiresIterator, pkgDto.getId().longValue(), - "requires", localHandler); - addPackageDepData(conflictsIterator, pkgDto.getId().longValue(), - "conflicts", localHandler); - addPackageDepData(obsoletesIterator, pkgDto.getId().longValue(), - "obsoletes", localHandler); - addPackageDepData(recommendsIterator, pkgDto.getId().longValue(), - "recommends", localHandler); - addPackageDepData(suggestsIterator, pkgDto.getId().longValue(), - "suggests", localHandler); - addPackageDepData(supplementsIterator, pkgDto.getId().longValue(), - "supplements", localHandler); - } + addPackageDepData( + TaskConstants.TASK_QUERY_REPOMD_GENERATOR_CAPABILITY_PROVI= DES, + pkgDto.getId(), "provides", localHandler); + addPackageDepData( + TaskConstants.TASK_QUERY_REPOMD_GENERATOR_CAPABILITY_REQUI= RES, + pkgDto.getId(), "requires", localHandler); + addPackageDepData( + TaskConstants.TASK_QUERY_REPOMD_GENERATOR_CAPABILITY_CONFL= ICTS, + pkgDto.getId(), "conflicts", localHandler); + addPackageDepData( + TaskConstants.TASK_QUERY_REPOMD_GENERATOR_CAPABILITY_OBSOL= ETES, + pkgDto.getId(), "obsoletes", localHandler); + addPackageDepData( + TaskConstants.TASK_QUERY_REPOMD_GENERATOR_CAPABILITY_RECOM= MENDS, + pkgDto.getId(), "recommends", localHandler); + addPackageDepData( + TaskConstants.TASK_QUERY_REPOMD_GENERATOR_CAPABILITY_SUGGE= STS, + pkgDto.getId(), "suggests", localHandler); + addPackageDepData( + TaskConstants.TASK_QUERY_REPOMD_GENERATOR_CAPABILITY_SUPPL= EMENTS, + pkgDto.getId(), "supplements", localHandler); + } = /** * @@ -287,21 +272,21 @@ public class PrimaryXmlWriter extends RepomdWriter { * @param dep dependency info * @throws SAXException sax exception */ - private void addPackageDepData(PackageCapabilityIterator pkgCapIter, l= ong pkgId, - String dep, SimpleContentHandler localHandler) throws SAXE= xception { + private void addPackageDepData(String query, Long pkgId, + String dep, SimpleContentHandler localHandler) throws SAXExcep= tion { + Collection capabilities =3D TaskManager + .getPackageCapabilityDtos(pkgId, query); localHandler.startElement("rpm:" + dep); - while (pkgCapIter.hasNextForPackage(pkgId)) { + for (PackageCapabilityDto capability : capabilities) { SimpleAttributesImpl attr =3D new SimpleAttributesImpl(); - attr.addAttribute("name", sanitize(pkgId, pkgCapIter - .getString("name"))); + attr.addAttribute("name", sanitize(pkgId, capability.getName()= )); Map evrMap =3D parseEvr(sanitize(pkgId, - pkgCapIter - .getString("version"))); + capability.getVersion())); = if (evrMap.get("epoch") !=3D null || evrMap.get("version") != =3D null || evrMap.get("release") !=3D null) { - attr.addAttribute("flags", getSenseAsString(pkgCapIter - .getNumber("sense").longValue())); + attr.addAttribute("flags", + getSenseAsString(capability.getSense())); } = if (evrMap.get("epoch") !=3D null) { @@ -330,7 +315,7 @@ public class PrimaryXmlWriter extends RepomdWriter { * @return package evr object */ private static Map parseEvr(String evr) { - Map map =3D new HashMap(); + Map map =3D new HashMap(); map.put("epoch", null); map.put("version", null); map.put("release", null); @@ -368,8 +353,12 @@ public class PrimaryXmlWriter extends RepomdWriter { private void addEssentialPackageFiles(long pkgId, SimpleContentHandler hndlr) throws SAXException { String regex =3D ".*bin/.*|^/etc/.*|^/usr/lib.sendmail$"; - while (filesIterator.hasNextForPackage(pkgId)) { - String path =3D sanitize(pkgId, filesIterator.getString("name"= )); + Collection files =3D TaskManager + .getPackageCapabilityDtos( + pkgId, + TaskConstants.TASK_QUERY_REPOMD_GENERATOR_CAPABILI= TY_FILES); + for (PackageCapabilityDto file : files) { + String path =3D sanitize(pkgId, file.getName()); if (path.matches(regex)) { hndlr.addElementWithCharacters("file", path); } diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/repomd/RepomdWrit= er.java b/java/code/src/com/redhat/rhn/taskomatic/task/repomd/RepomdWriter.= java index cc8f7c3..f05894f 100644 --- a/java/code/src/com/redhat/rhn/taskomatic/task/repomd/RepomdWriter.java +++ b/java/code/src/com/redhat/rhn/taskomatic/task/repomd/RepomdWriter.java @@ -42,8 +42,8 @@ public abstract class RepomdWriter { = static { CONTROL_CHARS =3D "\u0000\u0001\u0002\u0003\u0004\u0005\u0006\u000= 7\u0008" + - "\u000B\u000C\u000E\u000F\u0010\u0011\u0012\u0013\u0014\u= 0015" + - "\u0016\u0017\u0018\u0019\u001A\u001B\u001C\u001D\u001E\u= 001F"; + "\u000B\u000C\u000E\u000F\u0010\u0011\u0012\u0013\u0014\u0= 015" + + "\u0016\u0017\u0018\u0019\u001A\u001B\u001C\u001D\u001E\u0= 01F"; CONTROL_CHARS_REPLACEMENT =3D StringUtils.repeat(" ", CONTROL_CHAR= S.length()); } = @@ -146,7 +146,7 @@ public abstract class RepomdWriter { * @param pkgId package id * @param input char input */ - protected static String sanitize(long pkgId, String input) { + protected static String sanitize(Long pkgId, String input) { if (StringUtils.containsNone(input, CONTROL_CHARS)) { return input; } diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/repomd/RpmReposit= oryWriter.java b/java/code/src/com/redhat/rhn/taskomatic/task/repomd/RpmRep= ositoryWriter.java index 99236cf..5cd9c9d 100644 --- a/java/code/src/com/redhat/rhn/taskomatic/task/repomd/RpmRepositoryWrit= er.java +++ b/java/code/src/com/redhat/rhn/taskomatic/task/repomd/RpmRepositoryWrit= er.java @@ -40,10 +40,10 @@ import com.redhat.rhn.manager.rhnpackage.PackageManager; import com.redhat.rhn.manager.task.TaskManager; = /** -* -* @version $Rev $ -* -*/ + * + * @version $Rev $ + * + */ public class RpmRepositoryWriter extends RepositoryWriter { = private static final String PRIMARY_FILE =3D "primary.xml.gz.new"; @@ -91,7 +91,7 @@ public class RpmRepositoryWriter extends RepositoryWriter= { PackageManager.createRepoEntrys(channel.getId()); = String prefix =3D mountPoint + File.separator + pathPrefix + - File.separator + channel.getLabel() + File.separator; + File.separator + channel.getLabel() + File.separator; = // we closed the session, so we need to reload the object channel =3D (Channel) HibernateFactory.getSession().get(channel.ge= tClass(), @@ -116,7 +116,7 @@ public class RpmRepositoryWriter extends RepositoryWrit= er { String checksumAlgo =3D this.checksumtype; if (checksumAlgo.toUpperCase().startsWith("SHA")) { checksumAlgo =3D this.checksumtype.substring(0, 3) + "-" + - this.checksumtype.substring(3); + this.checksumtype.substring(3); } // translate sha1 to sha for xml repo files String checksumLabel =3D this.checksumtype; diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/repomd/UpdateInfo= Writer.java b/java/code/src/com/redhat/rhn/taskomatic/task/repomd/UpdateInf= oWriter.java index 37ed314..53edf80 100644 --- a/java/code/src/com/redhat/rhn/taskomatic/task/repomd/UpdateInfoWriter.= java +++ b/java/code/src/com/redhat/rhn/taskomatic/task/repomd/UpdateInfoWriter.= java @@ -104,7 +104,7 @@ public class UpdateInfoWriter extends RepomdWriter { * @throws SAXException */ private void addErratum(Errata erratum, Channel channel) - throws SAXException { + throws SAXException { SimpleAttributesImpl attr =3D new SimpleAttributesImpl(); attr.addAttribute("from", erratum.getErrataFrom()); attr.addAttribute("status", "final"); @@ -112,9 +112,11 @@ public class UpdateInfoWriter extends RepomdWriter { attr.addAttribute("version", Long.toString(erratum.getAdvisoryRel(= ))); handler.startElement("update", attr); = - handler.addElementWithCharacters("id", sanitize(0, erratum + handler.addElementWithCharacters("id", + sanitize(0L, erratum .getAdvisoryName())); - handler.addElementWithCharacters("title", sanitize(0, erratum + handler.addElementWithCharacters("title", + sanitize(0L, erratum .getSynopsis())); = DateFormat df =3D new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); @@ -129,7 +131,8 @@ public class UpdateInfoWriter extends RepomdWriter { handler.startElement("updated", attr); handler.endElement("updated"); = - handler.addElementWithCharacters("description", sanitize(0, erratum + handler.addElementWithCharacters("description", + sanitize(0L, erratum .getDescription())); = addErratumReferences(erratum); @@ -145,7 +148,7 @@ public class UpdateInfoWriter extends RepomdWriter { * @throws SAXException */ private void addErratumPkgList(Errata erratum, Channel channel) - throws SAXException { + throws SAXException { handler.startElement("pkglist"); = SimpleAttributesImpl attr =3D new SimpleAttributesImpl(); @@ -190,7 +193,7 @@ public class UpdateInfoWriter extends RepomdWriter { = attr.clear(); attr.addAttribute("type", - sanitize(pkgId, pkg.getChecksum().getChecksumType().ge= tLabel())); + sanitize(pkgId, pkg.getChecksum().getChecksumType(= ).getLabel())); handler.startElement("sum", attr); handler.addCharacters(sanitize(pkgId, pkg.getChecksum().ge= tChecksum())); handler.endElement("sum"); @@ -223,8 +226,8 @@ public class UpdateInfoWriter extends RepomdWriter { } else { attr.addAttribute("href", - "http://bugzilla.redhat.com/bugzilla/sho= w_bug.cgi?id=3D" + - bug.getId()); + "http://bugzilla.redhat.com/bugzilla/show_bug.cgi?= id=3D" + + bug.getId()); } attr.addAttribute("id", Long.toString(bug.getId())); attr.addAttribute("type", "bugzilla"); @@ -242,7 +245,7 @@ public class UpdateInfoWriter extends RepomdWriter { SimpleAttributesImpl attr =3D new SimpleAttributesImpl(); attr.addAttribute("href", "http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=3D"= + cve); - attr.addAttribute("id", sanitize(0, cve.getName())); + attr.addAttribute("id", sanitize(0L, cve.getName())); attr.addAttribute("type", "cve"); handler.startElement("reference", attr); handler.endElement("reference"); --===============1951399376498731151==-- From adelton at fedoraproject.org Thu Aug 20 12:13:39 2015 Content-Type: multipart/mixed; boundary="===============4957020631026570117==" MIME-Version: 1.0 From: Jan Pazdziora To: spacewalk-commits at lists.fedorahosted.org Subject: spacewalk/admin Date: Fri, 07 Dec 2012 08:01:20 +0000 Message-ID: <20121207080120.4D7591F05@hosted02.fedoraproject.org> --===============4957020631026570117== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable spacewalk/admin/spacewalk-service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 5c5f991e67f68bfbc67f090daefdfd162c088c01 Author: Jan Pazdziora Date: Fri Dec 7 09:01:03 2012 +0100 Fixing typo. diff --git a/spacewalk/admin/spacewalk-service b/spacewalk/admin/spacewalk-= service index 2a76fb7..1f4a491 100755 --- a/spacewalk/admin/spacewalk-service +++ b/spacewalk/admin/spacewalk-service @@ -32,7 +32,7 @@ if [ -x /etc/init.d/tomcat6 -o -x /lib/systemd/system/tom= cat6.service ]; then TOMCAT=3D"tomcat6" fi = -if [ /lib/systemd/system/tomcat.service ]; then +if [ -x /lib/systemd/system/tomcat.service ]; then TOMCAT=3D"tomcat" fi = --===============4957020631026570117==-- From adelton at fedoraproject.org Thu Aug 20 12:13:39 2015 Content-Type: multipart/mixed; boundary="===============6055647115055977982==" MIME-Version: 1.0 From: Jan Pazdziora To: spacewalk-commits at lists.fedorahosted.org Subject: rel-eng/packages spacewalk/admin Date: Fri, 07 Dec 2012 08:01:46 +0000 Message-ID: <20121207080146.288E89FBD5@fedorahosted.org> --===============6055647115055977982== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable rel-eng/packages/spacewalk-admin | 2 +- spacewalk/admin/spacewalk-admin.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) New commits: commit 13279f7b5a587f128dcf0b5c65a877d5524333eb Author: Jan Pazdziora Date: Fri Dec 7 09:01:36 2012 +0100 Automatic commit of package [spacewalk-admin] release [1.9.2-1]. diff --git a/rel-eng/packages/spacewalk-admin b/rel-eng/packages/spacewalk-= admin index 08d3f70..eb78fd6 100644 --- a/rel-eng/packages/spacewalk-admin +++ b/rel-eng/packages/spacewalk-admin @@ -1 +1 @@ -1.9.1-1 spacewalk/admin/ +1.9.2-1 spacewalk/admin/ diff --git a/spacewalk/admin/spacewalk-admin.spec b/spacewalk/admin/spacewa= lk-admin.spec index 173539d..4882b2b 100644 --- a/spacewalk/admin/spacewalk-admin.spec +++ b/spacewalk/admin/spacewalk-admin.spec @@ -2,7 +2,7 @@ Summary: Various utility scripts and data files for RHN Satellite installa= tions Name: spacewalk-admin URL: https://fedorahosted.org/spacewalk -Version: 1.9.1 +Version: 1.9.2 Release: 1%{?dist} Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version= }.tar.gz License: GPLv2 @@ -75,6 +75,9 @@ rm -rf $RPM_BUILD_ROOT %config(noreplace) %{_sysconfdir}/rhn/service-list = %changelog +* Fri Dec 07 2012 Jan Pazdziora 1.9.2-1 +- Fixing typo. + * Tue Dec 04 2012 Jan Pazdziora 1.9.1-1 - On Fedoras, start to use tomcat >=3D 7. = --===============6055647115055977982==-- From adelton at fedoraproject.org Thu Aug 20 12:13:39 2015 Content-Type: multipart/mixed; boundary="===============1300620801210376542==" MIME-Version: 1.0 From: Jan Pazdziora To: spacewalk-commits at lists.fedorahosted.org Subject: Changes to 'refs/tags/spacewalk-admin-1.9.2-1' Date: Fri, 07 Dec 2012 08:01:56 +0000 Message-ID: <20121207080156.D48901F05@hosted02.fedoraproject.org> --===============1300620801210376542== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Tag 'spacewalk-admin-1.9.2-1' created by Jan Pazdziora at 2012-12-07 08:01 +0000 Tagging package [spacewalk-admin] version [1.9.2-1] in directory [spacewalk= /admin/]. Changes since spacewalk-java-1.9.27-1: Jan Pazdziora (2): Fixing typo. Automatic commit of package [spacewalk-admin] release [1.9.2-1]. Stephen Herr (2): Revert "883546 - repodata inconsistency due to concurrent modificatio= n" 883546 - reworking how repodata xml gets built to avoid "snapshot too= old" errors --- java/code/src/com/redhat/rhn/common/db/datasource/xml/Task_queries.xml = | 150 +++---- java/code/src/com/redhat/rhn/frontend/dto/PackageCapabilityDto.java = | 87 ++++ java/code/src/com/redhat/rhn/frontend/dto/PackageChangelogDto.java = | 89 ++++ java/code/src/com/redhat/rhn/manager/task/TaskManager.java = | 32 + java/code/src/com/redhat/rhn/taskomatic/task/repomd/DebPackageWriter.java = | 56 +- java/code/src/com/redhat/rhn/taskomatic/task/repomd/FilelistsXmlWriter.jav= a | 18 = java/code/src/com/redhat/rhn/taskomatic/task/repomd/OtherXmlWriter.java = | 21 - java/code/src/com/redhat/rhn/taskomatic/task/repomd/PackageCapabilityItera= tor.java | 202 ---------- java/code/src/com/redhat/rhn/taskomatic/task/repomd/PrimaryXmlWriter.java = | 91 +--- java/code/src/com/redhat/rhn/taskomatic/task/repomd/RepomdWriter.java = | 6 = java/code/src/com/redhat/rhn/taskomatic/task/repomd/RpmRepositoryWriter.ja= va | 12 = java/code/src/com/redhat/rhn/taskomatic/task/repomd/UpdateInfoWriter.java = | 21 - rel-eng/packages/spacewalk-admin = | 2 = spacewalk/admin/spacewalk-admin.spec = | 5 = spacewalk/admin/spacewalk-service = | 2 = 15 files changed, 382 insertions(+), 412 deletions(-) --- --===============1300620801210376542==-- From adelton at fedoraproject.org Thu Aug 20 12:13:39 2015 Content-Type: multipart/mixed; boundary="===============0221810323341409926==" MIME-Version: 1.0 From: Jan Pazdziora To: spacewalk-commits at lists.fedorahosted.org Subject: 2 commits - java/spacewalk-java.spec rel-eng/packages web/spacewalk-web.spec Date: Fri, 07 Dec 2012 08:02:30 +0000 Message-ID: <20121207080230.392349FBD5@fedorahosted.org> --===============0221810323341409926== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/spacewalk-java.spec | 7 ++++++- rel-eng/packages/spacewalk-java | 2 +- rel-eng/packages/spacewalk-web | 2 +- web/spacewalk-web.spec | 5 ++++- 4 files changed, 12 insertions(+), 4 deletions(-) New commits: commit e4bb6a2752f5439cf7cea9e23a5ac68fe7d5b55c Author: Jan Pazdziora Date: Fri Dec 7 09:02:18 2012 +0100 Automatic commit of package [spacewalk-java] release [1.9.28-1]. diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index 084a9a0..9c4a987 100644 --- a/java/spacewalk-java.spec +++ b/java/spacewalk-java.spec @@ -28,7 +28,7 @@ Name: spacewalk-java Summary: Spacewalk Java site packages Group: Applications/Internet License: GPLv2 -Version: 1.9.27 +Version: 1.9.28 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{versi= on}.tar.gz = @@ -659,6 +659,11 @@ fi %{jardir}/postgresql-jdbc.jar = %changelog +* Fri Dec 07 2012 Jan Pazdziora 1.9.28-1 +- 883546 - reworking how repodata xml gets built to avoid "snapshot too ol= d" + errors +- Revert "883546 - repodata inconsistency due to concurrent modification" + * Wed Dec 05 2012 Tomas Lestach 1.9.27-1 - update catalina.out path for tomcat7 - KickstartFileSyncTaskTest should no longer fail diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-j= ava index 3cabaf1..c56f779 100644 --- a/rel-eng/packages/spacewalk-java +++ b/rel-eng/packages/spacewalk-java @@ -1 +1 @@ -1.9.27-1 java/ +1.9.28-1 java/ commit fb2f7dfc0319dd85f621f9aa1128c07ce435870f Author: Jan Pazdziora Date: Fri Dec 7 09:02:13 2012 +0100 Automatic commit of package [spacewalk-web] release [1.9.5-1]. diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web index d57a8a5..5637152 100644 --- a/rel-eng/packages/spacewalk-web +++ b/rel-eng/packages/spacewalk-web @@ -1 +1 @@ -1.9.4-1 web/ +1.9.5-1 web/ diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec index e0efe8d..254053b 100644 --- a/web/spacewalk-web.spec +++ b/web/spacewalk-web.spec @@ -2,7 +2,7 @@ Name: spacewalk-web Summary: Spacewalk Web site - Perl modules Group: Applications/Internet License: GPLv2 -Version: 1.9.4 +Version: 1.9.5 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk/ Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{ve= rsion}.tar.gz @@ -253,6 +253,9 @@ rm -rf $RPM_BUILD_ROOT = # $Id$ %changelog +* Fri Dec 07 2012 Jan Pazdziora 1.9.5-1 +- Remove sysdate keyword + * Wed Nov 28 2012 Tomas Lestach 1.9.4-1 - 470463 - fixing xmllint issue = --===============0221810323341409926==-- From adelton at fedoraproject.org Thu Aug 20 12:13:39 2015 Content-Type: multipart/mixed; boundary="===============5853872374136461833==" MIME-Version: 1.0 From: Jan Pazdziora To: spacewalk-commits at lists.fedorahosted.org Subject: Changes to 'refs/tags/spacewalk-java-1.9.28-1' Date: Fri, 07 Dec 2012 08:02:38 +0000 Message-ID: <20121207080238.77B531F05@hosted02.fedoraproject.org> --===============5853872374136461833== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Tag 'spacewalk-java-1.9.28-1' created by Jan Pazdziora at 2012-12-07 08:02 +0000 Tagging package [spacewalk-java] version [1.9.28-1] in directory [java/]. Changes since spacewalk-admin-1.9.2-1: Jan Pazdziora (2): Automatic commit of package [spacewalk-web] release [1.9.5-1]. Automatic commit of package [spacewalk-java] release [1.9.28-1]. --- java/spacewalk-java.spec | 7 ++++++- rel-eng/packages/spacewalk-java | 2 +- rel-eng/packages/spacewalk-web | 2 +- web/spacewalk-web.spec | 5 ++++- 4 files changed, 12 insertions(+), 4 deletions(-) --- --===============5853872374136461833==-- From adelton at fedoraproject.org Thu Aug 20 12:13:39 2015 Content-Type: multipart/mixed; boundary="===============2107470792301695127==" MIME-Version: 1.0 From: Jan Pazdziora To: spacewalk-commits at lists.fedorahosted.org Subject: Changes to 'refs/tags/spacewalk-web-1.9.5-1' Date: Fri, 07 Dec 2012 08:02:40 +0000 Message-ID: <20121207080240.3A8161F05@hosted02.fedoraproject.org> --===============2107470792301695127== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Tag 'spacewalk-web-1.9.5-1' created by Jan Pazdziora at 2012-12-07 08:02 +0000 Tagging package [spacewalk-web] version [1.9.5-1] in directory [web/]. Changes since spacewalk-admin-1.9.2-1: Jan Pazdziora (1): Automatic commit of package [spacewalk-web] release [1.9.5-1]. --- rel-eng/packages/spacewalk-web | 2 +- web/spacewalk-web.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) --- --===============2107470792301695127==-- From adelton at fedoraproject.org Thu Aug 20 12:13:39 2015 Content-Type: multipart/mixed; boundary="===============4397692207202554142==" MIME-Version: 1.0 From: Jan Pazdziora To: spacewalk-commits at lists.fedorahosted.org Subject: rel-eng/comps Date: Fri, 07 Dec 2012 09:11:45 +0000 Message-ID: <20121207091146.166D9178E@hosted02.fedoraproject.org> --===============4397692207202554142== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable rel-eng/comps/comps-spacewalk-server-fedora16.xml | 2 ++ rel-eng/comps/comps-spacewalk-server-fedora17.xml | 2 ++ rel-eng/comps/comps-spacewalk-server-rhel5.xml | 2 ++ rel-eng/comps/comps-spacewalk-server-rhel6.xml | 2 ++ 4 files changed, 8 insertions(+) New commits: commit 6e1a53a81584cd427010d16e7451691c866eff6d Author: Jan Pazdziora Date: Fri Dec 7 10:11:33 2012 +0100 Subpackages cobbler-web and koan are built from cobbler20 but we do not= want to ship them. diff --git a/rel-eng/comps/comps-spacewalk-server-fedora16.xml b/rel-eng/co= mps/comps-spacewalk-server-fedora16.xml index cfdd681..d4302a2 100644 --- a/rel-eng/comps/comps-spacewalk-server-fedora16.xml +++ b/rel-eng/comps/comps-spacewalk-server-fedora16.xml @@ -165,6 +165,8 @@ Spacewalk Server Non-installatble Packages false + cobbler-web + koan spacewalk-java-tests diff --git a/rel-eng/comps/comps-spacewalk-server-fedora17.xml b/rel-eng/co= mps/comps-spacewalk-server-fedora17.xml index f45c630..8eb0a8b 100644 --- a/rel-eng/comps/comps-spacewalk-server-fedora17.xml +++ b/rel-eng/comps/comps-spacewalk-server-fedora17.xml @@ -165,6 +165,8 @@ Spacewalk Server Non-installable Packages false + cobbler-web + koan spacewalk-java-tests diff --git a/rel-eng/comps/comps-spacewalk-server-rhel5.xml b/rel-eng/comps= /comps-spacewalk-server-rhel5.xml index 2ddfbb4..61049ba 100644 --- a/rel-eng/comps/comps-spacewalk-server-rhel5.xml +++ b/rel-eng/comps/comps-spacewalk-server-rhel5.xml @@ -238,6 +238,8 @@ Spacewalk Server Non-installatble Packages false + cobbler-web + koan spacewalk-java-tests diff --git a/rel-eng/comps/comps-spacewalk-server-rhel6.xml b/rel-eng/comps= /comps-spacewalk-server-rhel6.xml index 71d3a52..b00740f 100644 --- a/rel-eng/comps/comps-spacewalk-server-rhel6.xml +++ b/rel-eng/comps/comps-spacewalk-server-rhel6.xml @@ -168,6 +168,8 @@ Spacewalk Server Non-installatble Packages false + cobbler-web + koan spacewalk-java-tests --===============4397692207202554142==-- From adelton at fedoraproject.org Thu Aug 20 12:13:39 2015 Content-Type: multipart/mixed; boundary="===============1635509276563105020==" MIME-Version: 1.0 From: Jan Pazdziora To: spacewalk-commits at lists.fedorahosted.org Subject: rel-eng/comps Date: Fri, 07 Dec 2012 09:36:56 +0000 Message-ID: <20121207093656.CECAA2280@hosted02.fedoraproject.org> --===============1635509276563105020== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable rel-eng/comps/comps-spacewalk-server-fedora16.xml | 2 +- rel-eng/comps/comps-spacewalk-server-rhel5.xml | 2 +- rel-eng/comps/comps-spacewalk-server-rhel6.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) New commits: commit 8e78126d212046a9afc8a38208e48cee58b9b3e1 Author: Jan Pazdziora Date: Fri Dec 7 10:36:49 2012 +0100 Fixing typo. diff --git a/rel-eng/comps/comps-spacewalk-server-fedora16.xml b/rel-eng/co= mps/comps-spacewalk-server-fedora16.xml index d4302a2..8eb0a8b 100644 --- a/rel-eng/comps/comps-spacewalk-server-fedora16.xml +++ b/rel-eng/comps/comps-spacewalk-server-fedora16.xml @@ -162,7 +162,7 @@ spacewalk-server-no-install Spacewalk Server Junk - Spacewalk Server Non-installatble Packages + Spacewalk Server Non-installable Packages false cobbler-web diff --git a/rel-eng/comps/comps-spacewalk-server-rhel5.xml b/rel-eng/comps= /comps-spacewalk-server-rhel5.xml index 61049ba..4420431 100644 --- a/rel-eng/comps/comps-spacewalk-server-rhel5.xml +++ b/rel-eng/comps/comps-spacewalk-server-rhel5.xml @@ -235,7 +235,7 @@ spacewalk-server-no-install Spacewalk Server Junk - Spacewalk Server Non-installatble Packages + Spacewalk Server Non-installable Packages false cobbler-web diff --git a/rel-eng/comps/comps-spacewalk-server-rhel6.xml b/rel-eng/comps= /comps-spacewalk-server-rhel6.xml index b00740f..e728b08 100644 --- a/rel-eng/comps/comps-spacewalk-server-rhel6.xml +++ b/rel-eng/comps/comps-spacewalk-server-rhel6.xml @@ -165,7 +165,7 @@ spacewalk-server-no-install Spacewalk Server Junk - Spacewalk Server Non-installatble Packages + Spacewalk Server Non-installable Packages false cobbler-web --===============1635509276563105020==-- From adelton at fedoraproject.org Thu Aug 20 12:13:39 2015 Content-Type: multipart/mixed; boundary="===============7065529915184903937==" MIME-Version: 1.0 From: Jan Pazdziora To: spacewalk-commits at lists.fedorahosted.org Subject: rel-eng/comps Date: Fri, 07 Dec 2012 10:07:53 +0000 Message-ID: <20121207100753.9B07B178E@hosted02.fedoraproject.org> --===============7065529915184903937== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable rel-eng/comps/comps-spacewalk-server-fedora16.xml | 2 +- rel-eng/comps/comps-spacewalk-server-fedora17.xml | 2 +- rel-eng/comps/comps-spacewalk-server-rhel5.xml | 2 +- rel-eng/comps/comps-spacewalk-server-rhel6.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) New commits: commit ba5475fa8b735dfba12aeca2ab1e2da6c9241f7f Author: Jan Pazdziora Date: Fri Dec 7 11:07:43 2012 +0100 Move spacewalk-java-tests from the no-install group. diff --git a/rel-eng/comps/comps-spacewalk-server-fedora16.xml b/rel-eng/co= mps/comps-spacewalk-server-fedora16.xml index 8eb0a8b..3ce3ba9 100644 --- a/rel-eng/comps/comps-spacewalk-server-fedora16.xml +++ b/rel-eng/comps/comps-spacewalk-server-fedora16.xml @@ -107,6 +107,7 @@ spacewalk-java-lib spacewalk-java-oracle spacewalk-java-postgresql + spacewalk-java-tests spacewalk-jpp-workaround spacewalk-monitoring spacewalk-monitoring-selinux @@ -167,7 +168,6 @@ cobbler-web koan - spacewalk-java-tests diff --git a/rel-eng/comps/comps-spacewalk-server-fedora17.xml b/rel-eng/co= mps/comps-spacewalk-server-fedora17.xml index 8eb0a8b..3ce3ba9 100644 --- a/rel-eng/comps/comps-spacewalk-server-fedora17.xml +++ b/rel-eng/comps/comps-spacewalk-server-fedora17.xml @@ -107,6 +107,7 @@ spacewalk-java-lib spacewalk-java-oracle spacewalk-java-postgresql + spacewalk-java-tests spacewalk-jpp-workaround spacewalk-monitoring spacewalk-monitoring-selinux @@ -167,7 +168,6 @@ cobbler-web koan - spacewalk-java-tests diff --git a/rel-eng/comps/comps-spacewalk-server-rhel5.xml b/rel-eng/comps= /comps-spacewalk-server-rhel5.xml index 4420431..92e199a 100644 --- a/rel-eng/comps/comps-spacewalk-server-rhel5.xml +++ b/rel-eng/comps/comps-spacewalk-server-rhel5.xml @@ -149,6 +149,7 @@ spacewalk-java-lib spacewalk-java-oracle spacewalk-java-postgresql + spacewalk-java-tests spacewalk-monitoring spacewalk-monitoring-selinux spacewalk-oracle @@ -240,7 +241,6 @@ cobbler-web koan - spacewalk-java-tests diff --git a/rel-eng/comps/comps-spacewalk-server-rhel6.xml b/rel-eng/comps= /comps-spacewalk-server-rhel6.xml index e728b08..8239386 100644 --- a/rel-eng/comps/comps-spacewalk-server-rhel6.xml +++ b/rel-eng/comps/comps-spacewalk-server-rhel6.xml @@ -109,6 +109,7 @@ spacewalk-java-lib spacewalk-java-oracle spacewalk-java-postgresql + spacewalk-java-tests spacewalk-jpp-workaround spacewalk-monitoring spacewalk-monitoring-selinux @@ -170,7 +171,6 @@ cobbler-web koan - spacewalk-java-tests --===============7065529915184903937==-- From mzazrive at fedoraproject.org Thu Aug 20 12:13:39 2015 Content-Type: multipart/mixed; boundary="===============4401438820795943615==" MIME-Version: 1.0 From: Milan Zazrivec To: spacewalk-commits at lists.fedorahosted.org Subject: client/rhel Date: Fri, 07 Dec 2012 16:13:57 +0000 Message-ID: <20121207161357.102709FBD5@fedorahosted.org> --===============4401438820795943615== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable client/rhel/rhn-client-tools/src/up2date_client/hardware.py | 14 +++++++= ++--- 1 file changed, 11 insertions(+), 3 deletions(-) New commits: commit 54051af0f52cccac8823495e8e3b27029532f97a Author: Milan Zazrivec Date: Fri Dec 7 17:12:38 2012 +0100 882174 - read the hostname from /etc/hostname if needed diff --git a/client/rhel/rhn-client-tools/src/up2date_client/hardware.py b/= client/rhel/rhn-client-tools/src/up2date_client/hardware.py index 41856e4..97ba6b6 100644 --- a/client/rhel/rhn-client-tools/src/up2date_client/hardware.py +++ b/client/rhel/rhn-client-tools/src/up2date_client/hardware.py @@ -449,11 +449,19 @@ def findHostByRoute(): s.close() continue s.close() - = + + # Override hostname with the value from /etc/hostname + if os.path.isfile("/etc/hostname") and os.access("/etc/hostname", os.R= _OK): + hostnameinfo =3D open("/etc/hostname", "r").readlines() + + for info in hostnameinfo: + if not len(info): + continue + hostname =3D info.strip() + # Override hostname with the one in /etc/sysconfig/network = # for bz# 457953 - = - if os.path.isfile("/etc/sysconfig/network") and os.access("/etc/syscon= fig/network", os.R_OK): + elif os.path.isfile("/etc/sysconfig/network") and os.access("/etc/sysc= onfig/network", os.R_OK): networkinfo =3D open("/etc/sysconfig/network", "r").readlines() = for info in networkinfo: --===============4401438820795943615==-- From sherr at fedoraproject.org Thu Aug 20 12:13:39 2015 Content-Type: multipart/mixed; boundary="===============0368945544601895876==" MIME-Version: 1.0 From: StephenHerr To: spacewalk-commits at lists.fedorahosted.org Subject: backend/common client/rhel Date: Fri, 07 Dec 2012 19:36:11 +0000 Message-ID: <20121207193611.964101F87@hosted02.fedoraproject.org> --===============0368945544601895876== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable backend/common/rhnException.py | 3 = client/rhel/rhn-client-tools/src/up2date_client/rhnregGui.py | 4 + client/rhel/rhn-client-tools/src/up2date_client/rhnserver.py | 10 +- client/rhel/rhn-client-tools/src/up2date_client/tui.py | 3 = client/rhel/rhn-client-tools/src/up2date_client/up2dateErrors.py | 35 ++= +++++--- 5 files changed, 41 insertions(+), 14 deletions(-) New commits: commit 3856179a57bd4a237cc6221a03ce59e0d159df06 Author: Stephen Herr Date: Fri Dec 7 14:35:01 2012 -0500 885170 - provide translations of a new error recieved from Hosted diff --git a/backend/common/rhnException.py b/backend/common/rhnException.py index b8c6f61..69ed470 100644 --- a/backend/common/rhnException.py +++ b/backend/common/rhnException.py @@ -167,7 +167,7 @@ on this system."), does not already exists on the server """), 55: _(""" - The --force rhnpush option is disabled on this server. = + The --force rhnpush option is disabled on this server. Please contact your Satellite administrator for more help. """), = @@ -192,6 +192,7 @@ on this system."), """), 72: _("""You can not unsubscribe from base channel."""), 73: _("""Satellite or Proxy channel can not be subscribed."""), + 74: _("") # not used, reserved for Hosted-only RegistrationDenied err= or. = # 80-90: server group errors 80: _("There was an error while trying to join the system to its grou= ps"), diff --git a/client/rhel/rhn-client-tools/src/up2date_client/rhnregGui.py b= /client/rhel/rhn-client-tools/src/up2date_client/rhnregGui.py index 3dc260e..bbb8449 100644 --- a/client/rhel/rhn-client-tools/src/up2date_client/rhnregGui.py +++ b/client/rhel/rhn-client-tools/src/up2date_client/rhnregGui.py @@ -293,6 +293,7 @@ class ChooseServerPage: # If they changed the value, write it back to the config file. if customServer !=3D self.server: config.setServerURL(customServer) + self.server =3D customServer if not cfg['sslCACert']: up2dateConfig.set('sslCACert', '/usr/share/rhn/RHN-ORG-TRUSTED-SSL-CERT') @@ -730,6 +731,9 @@ class CreateProfilePage: except up2dateErrors.InsuffMgmntEntsError, e: pwin.hide() self.fatalError(_("Problem registering system:\n") + e.errmsg) + except up2dateErrors.RegistrationDeniedError, e: + pwin.hide() + self.fatalError(_("Problem registering system:\n") + e.errmsg) except up2dateErrors.InvalidProductRegistrationError, e: pwin.hide() errorWindow(_("The installation number [ %s ] provided is not = a valid installation number. Please go back to the previous screen and fix = it." % diff --git a/client/rhel/rhn-client-tools/src/up2date_client/rhnserver.py b= /client/rhel/rhn-client-tools/src/up2date_client/rhnserver.py index 671b96b..eb6553d 100644 --- a/client/rhel/rhn-client-tools/src/up2date_client/rhnserver.py +++ b/client/rhel/rhn-client-tools/src/up2date_client/rhnserver.py @@ -45,7 +45,7 @@ class _DoCallWrapper(object): A callable object that will handle multiple levels of attributes, and catch exceptions. """ - = + def __init__(self, server, method_name): self._server =3D server self._method_name =3D method_name @@ -80,7 +80,7 @@ class _DoCallWrapper(object): raise up2dateErrors.SSLCertificateVerifyFailedError(), Non= e, sys.exc_info()[2] else: raise up2dateErrors.NetworkError(message), None, sys.exc_i= nfo()[2] - = + def __exception_from_fault(self, fault): if fault.faultCode =3D=3D -3: # This username is already taken, or the password is incor= rect. @@ -118,6 +118,8 @@ class _DoCallWrapper(object): exception =3D up2dateErrors.AbuseError(fault.faultString) elif abs(fault.faultCode) =3D=3D 60: exception =3D up2dateErrors.AuthenticationTicketError(faul= t.faultString) + elif abs(fault.faultCode) =3D=3D 74: + exception =3D up2dateErrors.RegistrationDeniedError() elif abs(fault.faultCode) =3D=3D 105: exception =3D up2dateErrors.RhnUuidUniquenessError(fault.f= aultString) elif fault.faultCode =3D=3D 99: @@ -156,8 +158,8 @@ class _DoCallWrapper(object): = class RhnServer(object): = - """ = - An rpc server object that calls doCall for you, and catches lower = + """ + An rpc server object that calls doCall for you, and catches lower level exceptions """ = diff --git a/client/rhel/rhn-client-tools/src/up2date_client/tui.py b/clien= t/rhel/rhn-client-tools/src/up2date_client/tui.py index fd7d6ac..9429998 100644 --- a/client/rhel/rhn-client-tools/src/up2date_client/tui.py +++ b/client/rhel/rhn-client-tools/src/up2date_client/tui.py @@ -989,6 +989,9 @@ class SendingWindow: except up2dateErrors.InsuffMgmntEntsError, e: FatalErrorWindow(self.screen, _("Problem registering system:\n") + e.errmsg) + except up2dateErrors.RegistrationDeniedError, e: + FatalErrorWindow(self.screen, + _("Problem registering system:\n") + e.errmsg) except up2dateErrors.ActivationKeyUsageLimitError, e: FatalErrorWindow(self.screen, ACT_KEY_USAGE_LIMIT_ERROR) diff --git a/client/rhel/rhn-client-tools/src/up2date_client/up2dateErrors.= py b/client/rhel/rhn-client-tools/src/up2date_client/up2dateErrors.py index 39174a4..1dd32d3 100644 --- a/client/rhel/rhn-client-tools/src/up2date_client/up2dateErrors.py +++ b/client/rhel/rhn-client-tools/src/up2date_client/up2dateErrors.py @@ -170,10 +170,27 @@ class ValidationError(NoLogError, RhnServerException): class InvalidRegistrationNumberError(ValidationError): pass = +class RegistrationDeniedError(RhnServerException): + def __init__(self): + RhnServerException.__init__(self, self.changeExplanation()) + + def __repr__(self): + return self.value + + def changeExplanation(self): + return _(""" +Red Hat Network Classic is not supported. +To register with Red Hat Subscription Management please run: + + subscription-manager register --auto-attach + +Get more information at access.redhat.com/knowledge + """) + class InvalidProductRegistrationError(NoLogError): """indicates an error during server input validation""" premsg =3D _("The installation number is invalid") - = + class OemInfoFileError(NoLogError): premsg =3D _("Error parsing the oemInfo file at field:\n") = @@ -228,15 +245,15 @@ class SSLCertificateFileNotFound(Error): = class AuthenticationOrAccountCreationError(ValidationError): """Class that can represent different things depending on context: - While logging in with an existing user it represents a username or pas= sword = + While logging in with an existing user it represents a username or pas= sword being incorrect. - While creating a new account, it represents the username already being = + While creating a new account, it represents the username already being taken or the user not being allowed to create an account. Optimally these different things would be different exceptions, but th= ere are single fault codes the server can return to the client that can me= an - more than one of them so we have no way of knowing which is actually = + more than one of them so we have no way of knowing which is actually intended. - = + """ pass = @@ -272,19 +289,19 @@ class InsuffMgmntEntsError(RhnServerException): def changeExplanation(self, msg): newExpln =3D _(""" Your organization does not have enough Management entitlements to regi= ster this - system to Red Hat Network. Please notify your organization administrat= or of this error. = - You should be able to register this system after your organization fre= es existing = + system to Red Hat Network. Please notify your organization administrat= or of this error. + You should be able to register this system after your organization fre= es existing or purchases additional entitlements. Additional entitlements may be p= urchased by your organization administrator by logging into Red Hat Network and visiting the 'Subscription Management' page in the 'Your RHN' section of RHN. - = + A common cause of this error code is due to having mistakenly setup an Activation Key which is set as the universal default. If an activatio= n key is set on the account as a universal default, you can disable this key and re= try to avoid requiring a Management entitlement.""") term =3D "Explanation:" loc =3D msg.rindex(term) + len(term) - return msg[:loc] + newExpln = + return msg[:loc] + newExpln = class NoSystemIdError(NoLogError): pass --===============0368945544601895876==-- From adelton at fedoraproject.org Thu Aug 20 12:13:39 2015 Content-Type: multipart/mixed; boundary="===============8240591628552361535==" MIME-Version: 1.0 From: Jan Pazdziora To: spacewalk-commits at lists.fedorahosted.org Subject: 2 commits - rel-eng/packages spacewalk/admin Date: Mon, 10 Dec 2012 09:33:12 +0000 Message-ID: <20121210093312.D3CA3A0D86@fedorahosted.org> --===============8240591628552361535== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable rel-eng/packages/spacewalk-admin | 2 +- spacewalk/admin/spacewalk-admin.spec | 5 ++++- spacewalk/admin/spacewalk-service | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-) New commits: commit 8259aedddda508dc0c2e23645223f4dc1361fc95 Author: Jan Pazdziora Date: Mon Dec 10 10:33:01 2012 +0100 Automatic commit of package [spacewalk-admin] release [1.9.3-1]. diff --git a/rel-eng/packages/spacewalk-admin b/rel-eng/packages/spacewalk-= admin index eb78fd6..67d328d 100644 --- a/rel-eng/packages/spacewalk-admin +++ b/rel-eng/packages/spacewalk-admin @@ -1 +1 @@ -1.9.2-1 spacewalk/admin/ +1.9.3-1 spacewalk/admin/ diff --git a/spacewalk/admin/spacewalk-admin.spec b/spacewalk/admin/spacewa= lk-admin.spec index 4882b2b..cc6c0ce 100644 --- a/spacewalk/admin/spacewalk-admin.spec +++ b/spacewalk/admin/spacewalk-admin.spec @@ -2,7 +2,7 @@ Summary: Various utility scripts and data files for RHN Satellite installa= tions Name: spacewalk-admin URL: https://fedorahosted.org/spacewalk -Version: 1.9.2 +Version: 1.9.3 Release: 1%{?dist} Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version= }.tar.gz License: GPLv2 @@ -75,6 +75,9 @@ rm -rf $RPM_BUILD_ROOT %config(noreplace) %{_sysconfdir}/rhn/service-list = %changelog +* Mon Dec 10 2012 Jan Pazdziora 1.9.3-1 +- The systemd service files are not executable, using -e. + * Fri Dec 07 2012 Jan Pazdziora 1.9.2-1 - Fixing typo. = commit 0c2097be86d95434e46ccd0f890096eaecb595af Author: Jan Pazdziora Date: Mon Dec 10 10:32:11 2012 +0100 The systemd service files are not executable, using -e. diff --git a/spacewalk/admin/spacewalk-service b/spacewalk/admin/spacewalk-= service index 1f4a491..bf4aa90 100755 --- a/spacewalk/admin/spacewalk-service +++ b/spacewalk/admin/spacewalk-service @@ -28,11 +28,11 @@ if [ -x /etc/init.d/tomcat5 ]; then TOMCAT=3D"tomcat5" fi = -if [ -x /etc/init.d/tomcat6 -o -x /lib/systemd/system/tomcat6.service ]; t= hen +if [ -x /etc/init.d/tomcat6 -o -e /lib/systemd/system/tomcat6.service ]; t= hen TOMCAT=3D"tomcat6" fi = -if [ -x /lib/systemd/system/tomcat.service ]; then +if [ -e /lib/systemd/system/tomcat.service ]; then TOMCAT=3D"tomcat" fi = --===============8240591628552361535==-- From adelton at fedoraproject.org Thu Aug 20 12:13:39 2015 Content-Type: multipart/mixed; boundary="===============3175445633612622990==" MIME-Version: 1.0 From: Jan Pazdziora To: spacewalk-commits at lists.fedorahosted.org Subject: Changes to 'refs/tags/spacewalk-admin-1.9.3-1' Date: Mon, 10 Dec 2012 09:33:22 +0000 Message-ID: <20121210093322.9ED6B22C0@hosted02.fedoraproject.org> --===============3175445633612622990== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Tag 'spacewalk-admin-1.9.3-1' created by Jan Pazdziora at 2012-12-10 09:33 +0000 Tagging package [spacewalk-admin] version [1.9.3-1] in directory [spacewalk= /admin/]. Changes since spacewalk-java-1.9.28-1: Jan Pazdziora (5): Subpackages cobbler-web and koan are built from cobbler20 but we do n= ot want to ship them. Fixing typo. Move spacewalk-java-tests from the no-install group. The systemd service files are not executable, using -e. Automatic commit of package [spacewalk-admin] release [1.9.3-1]. Milan Zazrivec (1): 882174 - read the hostname from /etc/hostname if needed Stephen Herr (1): 885170 - provide translations of a new error recieved from Hosted --- backend/common/rhnException.py | 3 = client/rhel/rhn-client-tools/src/up2date_client/hardware.py | 14 ++= +- client/rhel/rhn-client-tools/src/up2date_client/rhnregGui.py | 4 + client/rhel/rhn-client-tools/src/up2date_client/rhnserver.py | 10 +- client/rhel/rhn-client-tools/src/up2date_client/tui.py | 3 = client/rhel/rhn-client-tools/src/up2date_client/up2dateErrors.py | 35 ++= +++++--- rel-eng/comps/comps-spacewalk-server-fedora16.xml | 6 + rel-eng/comps/comps-spacewalk-server-fedora17.xml | 4 - rel-eng/comps/comps-spacewalk-server-rhel5.xml | 6 + rel-eng/comps/comps-spacewalk-server-rhel6.xml | 6 + rel-eng/packages/spacewalk-admin | 2 = spacewalk/admin/spacewalk-admin.spec | 5 + spacewalk/admin/spacewalk-service | 4 - 13 files changed, 74 insertions(+), 28 deletions(-) --- --===============3175445633612622990==-- From adelton at fedoraproject.org Thu Aug 20 12:13:40 2015 Content-Type: multipart/mixed; boundary="===============5201331621581414894==" MIME-Version: 1.0 From: Jan Pazdziora To: spacewalk-commits at lists.fedorahosted.org Subject: 2 commits - backend/spacewalk-backend.spec client/rhel rel-eng/packages Date: Mon, 10 Dec 2012 09:33:54 +0000 Message-ID: <20121210093354.B3422A0D86@fedorahosted.org> --===============5201331621581414894== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable backend/spacewalk-backend.spec | 5 ++++- client/rhel/rhn-client-tools/rhn-client-tools.spec | 6 +++++- rel-eng/packages/rhn-client-tools | 2 +- rel-eng/packages/spacewalk-backend | 2 +- 4 files changed, 11 insertions(+), 4 deletions(-) New commits: commit 46a56a3ab8751230b3f12cb0113143a417ebcaa7 Author: Jan Pazdziora Date: Mon Dec 10 10:33:41 2012 +0100 Automatic commit of package [spacewalk-backend] release [1.9.12-1]. diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec index 7dd69fc..d94767d 100644 --- a/backend/spacewalk-backend.spec +++ b/backend/spacewalk-backend.spec @@ -12,7 +12,7 @@ Name: spacewalk-backend Summary: Common programs needed to be installed on the Spacewalk servers/p= roxies Group: Applications/Internet License: GPLv2 -Version: 1.9.11 +Version: 1.9.12 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version= }.tar.gz @@ -637,6 +637,9 @@ rm -f %{rhnconf}/rhnSecret.py* = # $Id$ %changelog +* Mon Dec 10 2012 Jan Pazdziora 1.9.12-1 +- 885170 - provide translations of a new error recieved from Hosted + * Tue Dec 04 2012 Jan Pazdziora 1.9.11-1 - On Fedoras, start to use tomcat >=3D 7. = diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewal= k-backend index f2a9bbb..3eaf6ae 100644 --- a/rel-eng/packages/spacewalk-backend +++ b/rel-eng/packages/spacewalk-backend @@ -1 +1 @@ -1.9.11-1 backend/ +1.9.12-1 backend/ commit 808707d826c4eee0f6e71b76884158d1d17f359b Author: Jan Pazdziora Date: Mon Dec 10 10:33:32 2012 +0100 Automatic commit of package [rhn-client-tools] release [1.9.7-1]. diff --git a/client/rhel/rhn-client-tools/rhn-client-tools.spec b/client/rh= el/rhn-client-tools/rhn-client-tools.spec index d080843..0a1bd91 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: 1.9.6 +Version: 1.9.7 Release: 1%{?dist} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -339,6 +339,10 @@ make -f Makefile.rhn-client-tools test %endif = %changelog +* Mon Dec 10 2012 Jan Pazdziora 1.9.7-1 +- 885170 - provide translations of a new error recieved from Hosted +- 882174 - read the hostname from /etc/hostname if needed + * Fri Nov 30 2012 Jan Pazdziora 1.9.6-1 - 876740 - fix typo - 876740 - server url auto-corrects common mistakes, messages say "Satelli= te" diff --git a/rel-eng/packages/rhn-client-tools b/rel-eng/packages/rhn-clien= t-tools index 3e4c3bf7..5a2740a 100644 --- a/rel-eng/packages/rhn-client-tools +++ b/rel-eng/packages/rhn-client-tools @@ -1 +1 @@ -1.9.6-1 client/rhel/rhn-client-tools/ +1.9.7-1 client/rhel/rhn-client-tools/ --===============5201331621581414894==-- From adelton at fedoraproject.org Thu Aug 20 12:13:40 2015 Content-Type: multipart/mixed; boundary="===============2217222146690092447==" MIME-Version: 1.0 From: Jan Pazdziora To: spacewalk-commits at lists.fedorahosted.org Subject: Changes to 'refs/tags/rhn-client-tools-1.9.7-1' Date: Mon, 10 Dec 2012 09:34:04 +0000 Message-ID: <20121210093404.9D2FD22C0@hosted02.fedoraproject.org> --===============2217222146690092447== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Tag 'rhn-client-tools-1.9.7-1' created by Jan Pazdziora at 2012-12-10 09:33 +0000 Tagging package [rhn-client-tools] version [1.9.7-1] in directory [client/r= hel/rhn-client-tools/]. Changes since spacewalk-admin-1.9.3-1: Jan Pazdziora (1): Automatic commit of package [rhn-client-tools] release [1.9.7-1]. --- client/rhel/rhn-client-tools/rhn-client-tools.spec | 6 +++++- rel-eng/packages/rhn-client-tools | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) --- --===============2217222146690092447==-- From adelton at fedoraproject.org Thu Aug 20 12:13:40 2015 Content-Type: multipart/mixed; boundary="===============4689549613379707805==" MIME-Version: 1.0 From: Jan Pazdziora To: spacewalk-commits at lists.fedorahosted.org Subject: Changes to 'refs/tags/spacewalk-backend-1.9.12-1' Date: Mon, 10 Dec 2012 09:34:06 +0000 Message-ID: <20121210093406.2A1AC22C0@hosted02.fedoraproject.org> --===============4689549613379707805== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Tag 'spacewalk-backend-1.9.12-1' created by Jan Pazdziora at 2012-12-10 09:33 +0000 Tagging package [spacewalk-backend] version [1.9.12-1] in directory [backen= d/]. Changes since rhn-client-tools-1.9.7-1: Jan Pazdziora (1): Automatic commit of package [spacewalk-backend] release [1.9.12-1]. --- backend/spacewalk-backend.spec | 5 ++++- rel-eng/packages/spacewalk-backend | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) --- --===============4689549613379707805==-- From adelton at fedoraproject.org Thu Aug 20 12:13:40 2015 Content-Type: multipart/mixed; boundary="===============0909758985990791001==" MIME-Version: 1.0 From: Jan Pazdziora To: spacewalk-commits at lists.fedorahosted.org Subject: backend/common Date: Mon, 10 Dec 2012 09:48:01 +0000 Message-ID: <20121210094801.4BA05A0D86@fedorahosted.org> --===============0909758985990791001== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable backend/common/rhnException.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit bf8ad23de280742d707cd54f9ff65ad40e153ad0 Author: Jan Pazdziora Date: Mon Dec 10 10:47:50 2012 +0100 885170 - fixing syntax. diff --git a/backend/common/rhnException.py b/backend/common/rhnException.py index 69ed470..d2829fe 100644 --- a/backend/common/rhnException.py +++ b/backend/common/rhnException.py @@ -192,7 +192,7 @@ on this system."), """), 72: _("""You can not unsubscribe from base channel."""), 73: _("""Satellite or Proxy channel can not be subscribed."""), - 74: _("") # not used, reserved for Hosted-only RegistrationDenied err= or. + 74: _(""), # not used, reserved for Hosted-only RegistrationDenied er= ror. = # 80-90: server group errors 80: _("There was an error while trying to join the system to its grou= ps"), --===============0909758985990791001==-- From adelton at fedoraproject.org Thu Aug 20 12:13:40 2015 Content-Type: multipart/mixed; boundary="===============8949549601694961632==" MIME-Version: 1.0 From: Jan Pazdziora To: spacewalk-commits at lists.fedorahosted.org Subject: backend/spacewalk-backend.spec rel-eng/packages Date: Mon, 10 Dec 2012 09:48:37 +0000 Message-ID: <20121210094837.40F2FA0D86@fedorahosted.org> --===============8949549601694961632== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable backend/spacewalk-backend.spec | 5 ++++- rel-eng/packages/spacewalk-backend | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) New commits: commit 562d4265e77b458160f1b36183b97d42b1ecceee Author: Jan Pazdziora Date: Mon Dec 10 10:48:27 2012 +0100 Automatic commit of package [spacewalk-backend] release [1.9.13-1]. diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec index d94767d..eabfc31 100644 --- a/backend/spacewalk-backend.spec +++ b/backend/spacewalk-backend.spec @@ -12,7 +12,7 @@ Name: spacewalk-backend Summary: Common programs needed to be installed on the Spacewalk servers/p= roxies Group: Applications/Internet License: GPLv2 -Version: 1.9.12 +Version: 1.9.13 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version= }.tar.gz @@ -637,6 +637,9 @@ rm -f %{rhnconf}/rhnSecret.py* = # $Id$ %changelog +* Mon Dec 10 2012 Jan Pazdziora 1.9.13-1 +- 885170 - fixing syntax. + * Mon Dec 10 2012 Jan Pazdziora 1.9.12-1 - 885170 - provide translations of a new error recieved from Hosted = diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewal= k-backend index 3eaf6ae..6f9a9de 100644 --- a/rel-eng/packages/spacewalk-backend +++ b/rel-eng/packages/spacewalk-backend @@ -1 +1 @@ -1.9.12-1 backend/ +1.9.13-1 backend/ --===============8949549601694961632==-- From adelton at fedoraproject.org Thu Aug 20 12:13:40 2015 Content-Type: multipart/mixed; boundary="===============4634770180124587673==" MIME-Version: 1.0 From: Jan Pazdziora To: spacewalk-commits at lists.fedorahosted.org Subject: Changes to 'refs/tags/spacewalk-backend-1.9.13-1' Date: Mon, 10 Dec 2012 09:48:45 +0000 Message-ID: <20121210094845.875731744@hosted02.fedoraproject.org> --===============4634770180124587673== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Tag 'spacewalk-backend-1.9.13-1' created by Jan Pazdziora at 2012-12-10 09:48 +0000 Tagging package [spacewalk-backend] version [1.9.13-1] in directory [backen= d/]. Changes since spacewalk-backend-1.9.12-1: Jan Pazdziora (2): 885170 - fixing syntax. Automatic commit of package [spacewalk-backend] release [1.9.13-1]. --- backend/common/rhnException.py | 2 +- backend/spacewalk-backend.spec | 5 ++++- rel-eng/packages/spacewalk-backend | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) --- --===============4634770180124587673==-- From mmraka at fedoraproject.org Thu Aug 20 12:13:40 2015 Content-Type: multipart/mixed; boundary="===============6394714604009474675==" MIME-Version: 1.0 From: Michael Mraka To: spacewalk-commits at lists.fedorahosted.org Subject: 2 commits - monitoring/rhnmd rel-eng/packages Date: Mon, 10 Dec 2012 11:01:15 +0000 Message-ID: <20121210110115.F2734A0D86@fedorahosted.org> --===============6394714604009474675== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable monitoring/rhnmd/rhnmd.spec | 39 +++++++++++++++++++++++++++++++++++---- rel-eng/packages/rhnmd | 2 +- 2 files changed, 36 insertions(+), 5 deletions(-) New commits: commit 2fd3e3a336266b9bbd4e68b6750826451cc3b57a Author: Michael Mraka Date: Mon Dec 10 12:01:03 2012 +0100 Automatic commit of package [rhnmd] release [5.3.13-1]. diff --git a/monitoring/rhnmd/rhnmd.spec b/monitoring/rhnmd/rhnmd.spec index 8fb3855..dcc3be0 100644 --- a/monitoring/rhnmd/rhnmd.spec +++ b/monitoring/rhnmd/rhnmd.spec @@ -8,7 +8,7 @@ Summary: Red Hat Network Monitoring Daemon Name: rhnmd URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{= version}.tar.gz -Version: 5.3.12 +Version: 5.3.13 Release: 1%{?dist} License: GPLv2 BuildArch: noarch @@ -182,6 +182,9 @@ rm -rf $RPM_BUILD_ROOT %doc LICENSE = %changelog +* Mon Dec 10 2012 Michael Mraka 5.3.13-1 +- use rhnmd.service on Fedora + * Sun Nov 11 2012 Michael Calmer 5.3.12-1 - create rhnmd.service for systemd - no use of /var/lock/subsys/ anymore diff --git a/rel-eng/packages/rhnmd b/rel-eng/packages/rhnmd index b773ee9..018b726 100644 --- a/rel-eng/packages/rhnmd +++ b/rel-eng/packages/rhnmd @@ -1 +1 @@ -5.3.12-1 monitoring/rhnmd/ +5.3.13-1 monitoring/rhnmd/ commit c2bd154fde8911462576ce3dbe890f5b830d4248 Author: Michael Mraka Date: Mon Dec 10 11:55:23 2012 +0100 use rhnmd.service on Fedora diff --git a/monitoring/rhnmd/rhnmd.spec b/monitoring/rhnmd/rhnmd.spec index b49865e..8fb3855 100644 --- a/monitoring/rhnmd/rhnmd.spec +++ b/monitoring/rhnmd/rhnmd.spec @@ -20,6 +20,21 @@ Requires: openssh BuildRequires: sysconfig %else Requires: openssh-server +%if 0%{?fedora} +Requires(post): chkconfig +Requires(preun): chkconfig +Requires(post): systemd-sysv +Requires(preun): systemd-sysv +Requires(post): systemd-units +Requires(preun): systemd-units +BuildRequires: systemd-units +%else +Requires(post): chkconfig +Requires(preun): chkconfig +# This is for /sbin/service +Requires(preun): initscripts +Requires(postun): initscripts +%endif %endif %if 0%{?suse_version} >=3D 1210 BuildRequires: systemd @@ -64,9 +79,14 @@ mkdir -p $RPM_BUILD_ROOT%{_initddir} install -pm 0755 rhnmd.init.SUSE $RPM_BUILD_ROOT%{_initddir}/rhnmd %endif %else +%if 0%{?fedora} +mkdir -p $RPM_BUILD_ROOT/%{_unitdir} +install -m 0644 rhnmd.service $RPM_BUILD_ROOT/%{_unitdir}/ +%else mkdir -p $RPM_BUILD_ROOT%{_initddir} install -pm 0755 rhnmd-init $RPM_BUILD_ROOT%{_initddir}/rhnmd %endif +%endif install -pm 0755 rhnmd_create_key.sh $RPM_BUILD_ROOT%{_var}/lib/%{np_name}= /sbin/ install -pm 0644 rhnmd_config $RPM_BUILD_ROOT%{_sysconfdir}/%{np_name}/rhn= md_config install -pm 0600 authorized_keys $RPM_BUILD_ROOT%{_var}/lib/%{np_name}/.ss= h/authorized_keys @@ -108,7 +128,9 @@ fi %if 0%{?suse_version} >=3D 1210 %service_add_post rhnmd.service %else -/sbin/chkconfig --add rhnmd +if [ -f /etc/init.d/rhnmd ]; then + /sbin/chkconfig --add rhnmd +fi /usr/sbin/semanage fcontext -a -t sshd_key_t '/var/lib/nocpulse/\.ssh/nocp= ulse-identity' || : %if 0%{?rhel} && "%rhel" < "6" /usr/sbin/semanage fcontext -a -t sshd_key_t '/var/lib/nocpulse/\.ssh/auth= orized_keys' || : @@ -123,8 +145,14 @@ fi %service_del_preun rhnmd.service %else if [ $1 =3D 0 ]; then + %if 0%{?fedora} + /bin/systemctl stop rhnmd.service >/dev/null 2>&1 + %else /sbin/service rhnmd stop > /dev/null 2>&1 - /sbin/chkconfig --del rhnmd + %endif + if [ -f /etc/init.d/rhnmd ]; then + /sbin/chkconfig --del rhnmd + fi fi %endif = @@ -146,7 +174,7 @@ rm -rf $RPM_BUILD_ROOT %{_var}/lib/%{np_name}/sbin/* %{_usr}/sbin/rhnmd %config(noreplace) %{_sysconfdir}/%{np_name}/rhnmd_config -%if 0%{?suse_version} >=3D 1210 +%if 0%{?fedora} || 0%{?suse_version} >=3D 1210 %{_unitdir}/rhnmd.service %else %{_initddir}/rhnmd --===============6394714604009474675==-- From mmraka at fedoraproject.org Thu Aug 20 12:13:40 2015 Content-Type: multipart/mixed; boundary="===============4756857976166395958==" MIME-Version: 1.0 From: Michael Mraka To: spacewalk-commits at lists.fedorahosted.org Subject: Changes to 'refs/tags/rhnmd-5.3.13-1' Date: Mon, 10 Dec 2012 11:01:27 +0000 Message-ID: <20121210110127.AA8DF2DEE@hosted02.fedoraproject.org> --===============4756857976166395958== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Tag 'rhnmd-5.3.13-1' created by Michael Mraka = at 2012-12-10 11:01 +0000 Tagging package [rhnmd] version [5.3.13-1] in directory [monitoring/rhnmd/]. Changes since spacewalk-backend-1.9.13-1: Michael Mraka (2): use rhnmd.service on Fedora Automatic commit of package [rhnmd] release [5.3.13-1]. --- monitoring/rhnmd/rhnmd.spec | 39 +++++++++++++++++++++++++++++++++++---- rel-eng/packages/rhnmd | 2 +- 2 files changed, 36 insertions(+), 5 deletions(-) --- --===============4756857976166395958==-- From adelton at fedoraproject.org Thu Aug 20 12:13:40 2015 Content-Type: multipart/mixed; boundary="===============2637199162002210257==" MIME-Version: 1.0 From: Jan Pazdziora To: spacewalk-commits at lists.fedorahosted.org Subject: client/tools Date: Mon, 10 Dec 2012 11:43:00 +0000 Message-ID: <20121210114300.89E5623BE@hosted02.fedoraproject.org> --===============2637199162002210257== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable client/tools/osad/osad.spec | 5 +++++ client/tools/osad/src/rhn_log.py | 7 +++---- 2 files changed, 8 insertions(+), 4 deletions(-) New commits: commit 16199307a35484e0af5dd152b0ffc228df176e8a Author: Marcelo Moreira de Mello Date: Fri Dec 7 16:24:44 2012 -0200 836984 - fixes the permissions on /var/log/osad log file diff --git a/client/tools/osad/osad.spec b/client/tools/osad/osad.spec index 57014b7..b954b59 100644 --- a/client/tools/osad/osad.spec +++ b/client/tools/osad/osad.spec @@ -202,6 +202,11 @@ rm -rf $RPM_BUILD_ROOT if [ -f %{_sysconfdir}/init.d/osad ]; then /sbin/chkconfig --add osad fi + +# Fix the /var/log/osad permission BZ 836984 +if [ -f %{_var}/log/osad ]; then + /bin/chmod 600 %{_var}/log/osad +fi %endif = %preun diff --git a/client/tools/osad/src/rhn_log.py b/client/tools/osad/src/rhn_l= og.py index 7b23501..3607c1a 100644 --- a/client/tools/osad/src/rhn_log.py +++ b/client/tools/osad/src/rhn_log.py @@ -39,10 +39,9 @@ class Logger: = if not Logger.logfile is None: try: - file =3D open( Logger.logfile, 'a' ) - os.chmod(Logger.logfile, 0600) - file.write( outstring ) - file.close() + fd =3D os.open(Logger.logfile, os.O_APPEND | os.O_RDWR= | os.O_CREAT, 0600) + os.write(fd, outstring) + os.close(fd) except IOError: raise = = --===============2637199162002210257==-- From adelton at fedoraproject.org Thu Aug 20 12:13:40 2015 Content-Type: multipart/mixed; boundary="===============4876804846248853959==" MIME-Version: 1.0 From: Jan Pazdziora To: spacewalk-commits at lists.fedorahosted.org Subject: client/tools rel-eng/packages Date: Mon, 10 Dec 2012 11:43:29 +0000 Message-ID: <20121210114329.56D56A0D86@fedorahosted.org> --===============4876804846248853959== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable client/tools/osad/osad.spec | 5 ++++- rel-eng/packages/osad | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) New commits: commit 5aadeed3132320451bcdd34f1ca2345de2ce721c Author: Jan Pazdziora Date: Mon Dec 10 12:43:20 2012 +0100 Automatic commit of package [osad] release [5.11.14-1]. diff --git a/client/tools/osad/osad.spec b/client/tools/osad/osad.spec index b954b59..c5f204a 100644 --- a/client/tools/osad/osad.spec +++ b/client/tools/osad/osad.spec @@ -16,7 +16,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.11.13 +Version: 5.11.14 Release: 1%{?dist} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -350,6 +350,9 @@ rpm -ql osa-dispatcher | xargs -n 1 /sbin/restorecon -r= vi {} %endif = %changelog +* Mon Dec 10 2012 Jan Pazdziora 5.11.14-1 +- 836984 - fixes the permissions on /var/log/osad log file + * Thu Nov 22 2012 Jan Pazdziora 5.11.13-1 - always commit the update = diff --git a/rel-eng/packages/osad b/rel-eng/packages/osad index 13283d5..fa0b4f3 100644 --- a/rel-eng/packages/osad +++ b/rel-eng/packages/osad @@ -1 +1 @@ -5.11.13-1 client/tools/osad/ +5.11.14-1 client/tools/osad/ --===============4876804846248853959==-- From adelton at fedoraproject.org Thu Aug 20 12:13:40 2015 Content-Type: multipart/mixed; boundary="===============2778493384191962352==" MIME-Version: 1.0 From: Jan Pazdziora To: spacewalk-commits at lists.fedorahosted.org Subject: Changes to 'refs/tags/osad-5.11.14-1' Date: Mon, 10 Dec 2012 11:43:41 +0000 Message-ID: <20121210114341.79F15A0D86@fedorahosted.org> --===============2778493384191962352== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Tag 'osad-5.11.14-1' created by Jan Pazdziora at = 2012-12-10 11:43 +0000 Tagging package [osad] version [5.11.14-1] in directory [client/tools/osad/= ]. Changes since rhnmd-5.3.13-1: Jan Pazdziora (1): Automatic commit of package [osad] release [5.11.14-1]. Marcelo Moreira de Mello (1): 836984 - fixes the permissions on /var/log/osad log file --- client/tools/osad/osad.spec | 10 +++++++++- client/tools/osad/src/rhn_log.py | 7 +++---- rel-eng/packages/osad | 2 +- 3 files changed, 13 insertions(+), 6 deletions(-) --- --===============2778493384191962352==-- From mmraka at fedoraproject.org Thu Aug 20 12:13:41 2015 Content-Type: multipart/mixed; boundary="===============6947408349620587566==" MIME-Version: 1.0 From: Michael Mraka To: spacewalk-commits at lists.fedorahosted.org Subject: 3 commits - monitoring/rhnmd rel-eng/packages Date: Mon, 10 Dec 2012 13:32:08 +0000 Message-ID: <20121210133208.CCAB1A0D86@fedorahosted.org> --===============6947408349620587566== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable monitoring/rhnmd/rhnmd.service | 3 ++- monitoring/rhnmd/rhnmd.spec | 6 +++++- rel-eng/packages/rhnmd | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) New commits: commit 18c51415624a5f429a3c32ea5e0844337d109a8a Author: Michael Mraka Date: Mon Dec 10 14:31:55 2012 +0100 Automatic commit of package [rhnmd] release [5.3.14-1]. diff --git a/monitoring/rhnmd/rhnmd.spec b/monitoring/rhnmd/rhnmd.spec index dcc3be0..ed08e41 100644 --- a/monitoring/rhnmd/rhnmd.spec +++ b/monitoring/rhnmd/rhnmd.spec @@ -8,7 +8,7 @@ Summary: Red Hat Network Monitoring Daemon Name: rhnmd URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{= version}.tar.gz -Version: 5.3.13 +Version: 5.3.14 Release: 1%{?dist} License: GPLv2 BuildArch: noarch @@ -182,6 +182,10 @@ rm -rf $RPM_BUILD_ROOT %doc LICENSE = %changelog +* Mon Dec 10 2012 Michael Mraka 5.3.14-1 +- added missing pid file +- fixed service description + * Mon Dec 10 2012 Michael Mraka 5.3.13-1 - use rhnmd.service on Fedora = diff --git a/rel-eng/packages/rhnmd b/rel-eng/packages/rhnmd index 018b726..884a5ef 100644 --- a/rel-eng/packages/rhnmd +++ b/rel-eng/packages/rhnmd @@ -1 +1 @@ -5.3.13-1 monitoring/rhnmd/ +5.3.14-1 monitoring/rhnmd/ commit 9c2cf299d36c73b68ce2b03d76bdab3c80bd5c6a Author: Michael Mraka Date: Mon Dec 10 14:22:26 2012 +0100 added missing pid file diff --git a/monitoring/rhnmd/rhnmd.service b/monitoring/rhnmd/rhnmd.service index 0c8532a8..dc5ec97 100644 --- a/monitoring/rhnmd/rhnmd.service +++ b/monitoring/rhnmd/rhnmd.service @@ -4,6 +4,7 @@ After=3Dsyslog.target network.target auditd.service = [Service] User=3Dnocpulse +PIDFile=3D/var/run/rhnmd.pid ExecStartPre=3D/var/lib/nocpulse/sbin/rhnmd_create_key.sh ExecStart=3D/usr/sbin/rhnmd -D -f /etc/nocpulse/rhnmd_config ExecReload=3D/bin/kill -HUP $MAINPID commit 94c30cbcc4b2854ecfbd07096aa73b0d45d1f38e Author: Michael Mraka Date: Mon Dec 10 14:21:32 2012 +0100 fixed service description diff --git a/monitoring/rhnmd/rhnmd.service b/monitoring/rhnmd/rhnmd.service index 4f1dadb..0c8532a8 100644 --- a/monitoring/rhnmd/rhnmd.service +++ b/monitoring/rhnmd/rhnmd.service @@ -1,5 +1,5 @@ [Unit] -Description=3Drhnmd server daemon +Description=3DRed Hat Network Monitoring daemon After=3Dsyslog.target network.target auditd.service = [Service] --===============6947408349620587566==-- From mmraka at fedoraproject.org Thu Aug 20 12:13:41 2015 Content-Type: multipart/mixed; boundary="===============5107437891870605002==" MIME-Version: 1.0 From: Michael Mraka To: spacewalk-commits at lists.fedorahosted.org Subject: Changes to 'refs/tags/rhnmd-5.3.14-1' Date: Mon, 10 Dec 2012 13:32:26 +0000 Message-ID: <20121210133226.D4E2D2364@hosted02.fedoraproject.org> --===============5107437891870605002== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Tag 'rhnmd-5.3.14-1' created by Michael Mraka = at 2012-12-10 13:31 +0000 Tagging package [rhnmd] version [5.3.14-1] in directory [monitoring/rhnmd/]. Changes since osad-5.11.14-1: Michael Mraka (3): fixed service description added missing pid file Automatic commit of package [rhnmd] release [5.3.14-1]. --- monitoring/rhnmd/rhnmd.service | 3 ++- monitoring/rhnmd/rhnmd.spec | 6 +++++- rel-eng/packages/rhnmd | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) --- --===============5107437891870605002==-- From mmraka at fedoraproject.org Thu Aug 20 12:13:41 2015 Content-Type: multipart/mixed; boundary="===============2946127517002354682==" MIME-Version: 1.0 From: Michael Mraka To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'SPACEWALK-1.8' - 3 commits - java/code java/spacewalk-java.spec rel-eng/packages Date: Mon, 10 Dec 2012 13:42:44 +0000 Message-ID: <20121210134244.BB35EA0D86@fedorahosted.org> --===============2946127517002354682== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml = | 14 +++++----- java/spacewalk-java.spec = | 7 ++++- rel-eng/packages/spacewalk-java = | 2 - 3 files changed, 15 insertions(+), 8 deletions(-) New commits: commit f4de6a79e3dd7bed825056117863545c9c3a3442 Author: Michael Mraka Date: Mon Dec 10 14:42:25 2012 +0100 Automatic commit of package [spacewalk-java] release [1.8.181-1]. diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index 899dbd5..0637d36 100644 --- a/java/spacewalk-java.spec +++ b/java/spacewalk-java.spec @@ -23,7 +23,7 @@ Name: spacewalk-java Summary: Spacewalk Java site packages Group: Applications/Internet License: GPLv2 -Version: 1.8.180 +Version: 1.8.181 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{versi= on}.tar.gz = @@ -617,6 +617,11 @@ fi %{jardir}/postgresql-jdbc.jar = %changelog +* Mon Dec 10 2012 Michael Mraka 1.8.181-1 +- 839960 - fix system.listLatestUpgradablePackages API to list upgradable + packages from server channels only +- Use braces for accessing composite types in PG + * Mon Nov 05 2012 Tomas Lestach 1.8.180-1 - replace remaining DTD paths to www.hibernate.org/dtd with 3.2 default hibernate.sourceforge.net diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-j= ava index 4f5334f..43ec6ca 100644 --- a/rel-eng/packages/spacewalk-java +++ b/rel-eng/packages/spacewalk-java @@ -1 +1 @@ -1.8.180-1 java/ +1.8.181-1 java/ commit 78fc0687052d1b53cfb5e8868e161dd777ddc12d Author: Tomas Lestach Date: Wed Oct 31 15:05:27 2012 +0100 839960 - fix system.listLatestUpgradablePackages API to list upgradable= packages from server channels only (cherry picked from commit 1168f61a9d16b42b533a21513c8538529862e745) 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 d3a48c0..a71dfcf 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 @@ -867,6 +867,8 @@ ORDER BY UPPER(PN.name) GROUP BY p.name_id) u JOIN rhnPackageEvr e ON e.evr =3D u.max_evr JOIN rhnPackage p ON p.name_id =3D u.name_id AND p.evr_id =3D e.id + JOIN rhnChannelPackage cp ON cp.package_id =3D p.id + JOIN rhnServerChannel sc ON sc.channel_id =3D cp.channel_id AND sc.ser= ver_id =3D :sid JOIN rhnPackageArch a ON a.id =3D p.package_arch_id ) up, rhnPackageUpgradeArchCompat puac commit da43a32d242e23aceca1f37fdf3ac0ebbfe18e7b Author: Johannes Renner Date: Wed Oct 31 12:18:02 2012 +0100 Use braces for accessing composite types in PG (cherry picked from commit 594781171402e28f85cdcb9fe7e838e35288a505) 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 5b48954..d3a48c0 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 @@ -838,14 +838,14 @@ ORDER BY UPPER(PN.name) SELECT n.name, - NVL(sp.evr.epoch, ' ') as from_epoch, - NVL(sp.evr.version, ' ') as from_version, - NVL(sp.evr.release, ' ') as from_release, + NVL((sp.evr).epoch, ' ') as from_epoch, + NVL((sp.evr).version, ' ') as from_version, + NVL((sp.evr).release, ' ') as from_release, spa.label as from_arch, spa.label as arch, - NVL(up.evr.epoch, ' ') as to_epoch, - NVL(up.evr.version, ' ') as to_version, - NVL(up.evr.release, ' ') as to_release, + NVL((up.evr).epoch, ' ') as to_epoch, + NVL((up.evr).version, ' ') as to_version, + NVL((up.evr).release, ' ') as to_release, up.arch_label as to_arch, up.id as to_package_id FROM --===============2946127517002354682==-- From mmraka at fedoraproject.org Thu Aug 20 12:13:41 2015 Content-Type: multipart/mixed; boundary="===============1106047931857654784==" MIME-Version: 1.0 From: Michael Mraka To: spacewalk-commits at lists.fedorahosted.org Subject: Changes to 'refs/tags/spacewalk-java-1.8.181-1' Date: Mon, 10 Dec 2012 13:42:56 +0000 Message-ID: <20121210134256.AEE1BA0D86@fedorahosted.org> --===============1106047931857654784== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Tag 'spacewalk-java-1.8.181-1' created by Michael Mraka at 2012-12-10 13:42 +0000 Tagging package [spacewalk-java] version [1.8.181-1] in directory [java/]. Changes since spacewalk-schema-1.8.89-1: Johannes Renner (1): Use braces for accessing composite types in PG Michael Mraka (1): Automatic commit of package [spacewalk-java] release [1.8.181-1]. Tomas Lestach (1): 839960 - fix system.listLatestUpgradablePackages API to list upgradab= le packages from server channels only --- java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml = | 14 +++++----- java/spacewalk-java.spec = | 7 ++++- rel-eng/packages/spacewalk-java = | 2 - 3 files changed, 15 insertions(+), 8 deletions(-) --- --===============1106047931857654784==-- From adelton at fedoraproject.org Thu Aug 20 12:13:41 2015 Content-Type: multipart/mixed; boundary="===============7853724080137285396==" MIME-Version: 1.0 From: Jan Pazdziora To: spacewalk-commits at lists.fedorahosted.org Subject: 2 commits - rel-eng/packages spec-tree/heirloom-pkgtools Date: Tue, 11 Dec 2012 09:04:02 +0000 Message-ID: <20121211090402.5E25414CD@hosted02.fedoraproject.org> --===============7853724080137285396== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable rel-eng/packages/heirloom-pkgtools | 2 +- spec-tree/heirloom-pkgtools/build.py.props | 3 +++ spec-tree/heirloom-pkgtools/heirloom-pkgtools.spec | 6 +++++- 3 files changed, 9 insertions(+), 2 deletions(-) New commits: commit 0e2274cb8fbbc9cd43c5e4454e59f68fd03365c5 Author: Jan Pazdziora Date: Tue Dec 11 10:03:48 2012 +0100 Automatic commit of package [heirloom-pkgtools] minor release [1.070227= -7]. diff --git a/rel-eng/packages/heirloom-pkgtools b/rel-eng/packages/heirloom= -pkgtools index 9b208ad..c4ac6d5 100644 --- a/rel-eng/packages/heirloom-pkgtools +++ b/rel-eng/packages/heirloom-pkgtools @@ -1 +1 @@ -1.070227-6 spec-tree/heirloom-pkgtools/ +1.070227-7 spec-tree/heirloom-pkgtools/ diff --git a/spec-tree/heirloom-pkgtools/heirloom-pkgtools.spec b/spec-tree= /heirloom-pkgtools/heirloom-pkgtools.spec index e4e7da1..998b3c4 100644 --- a/spec-tree/heirloom-pkgtools/heirloom-pkgtools.spec +++ b/spec-tree/heirloom-pkgtools/heirloom-pkgtools.spec @@ -6,7 +6,7 @@ Summary: Heirloom Packaging Tools Group: Development/Tools License: CDDL Version: 1.%{heriloom_pkgtools_version} -Release: 6%{?dist} +Release: 7%{?dist} = URL: http://heirloom.sourceforge.net/pkgtools.html Source0: %{name}-%{heriloom_pkgtools_version}.tar.bz2 @@ -97,6 +97,10 @@ rm -rf $RPM_BUILD_ROOT %{_var}/sadm/install/admin/default = %changelog +* Tue Dec 11 2012 Jan Pazdziora 1.070227-7 +- set correct tagger for heirloom-pkgtools +- set correct builder for heirloom-pkgtools + * Fri Feb 27 2009 Jan Pazdziora 1.070227-6 - fixed pkgmk producing wrong checksums in pkgmap on 64bit = commit da6328b4595434fb49510b9c67f8b6c5353137a6 Author: Jan Pazdziora Date: Tue Dec 11 09:55:49 2012 +0100 set correct tagger for heirloom-pkgtools diff --git a/spec-tree/heirloom-pkgtools/build.py.props b/spec-tree/heirloo= m-pkgtools/build.py.props index 2222932..bce2f0f 100644 --- a/spec-tree/heirloom-pkgtools/build.py.props +++ b/spec-tree/heirloom-pkgtools/build.py.props @@ -1,3 +1,6 @@ [buildconfig] builder =3D spacewalkx.builderx.NoTgzBuilder = +[buildconfig] +tagger =3D spacewalk.releng.tagger.ReleaseTagger + --===============7853724080137285396==-- From adelton at fedoraproject.org Thu Aug 20 12:13:41 2015 Content-Type: multipart/mixed; boundary="===============5620461167050091088==" MIME-Version: 1.0 From: Jan Pazdziora To: spacewalk-commits at lists.fedorahosted.org Subject: Changes to 'refs/tags/heirloom-pkgtools-1.070227-7' Date: Tue, 11 Dec 2012 09:04:13 +0000 Message-ID: <20121211090413.7A3B9A0D86@fedorahosted.org> --===============5620461167050091088== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Tag 'heirloom-pkgtools-1.070227-7' created by Jan Pazdziora at 2012-12-11 09:03 +0000 Tagging package [heirloom-pkgtools] version [1.070227-7] in directory [spec= -tree/heirloom-pkgtools/]. Changes since rhnmd-5.3.14-1: Jan Pazdziora (2): set correct tagger for heirloom-pkgtools Automatic commit of package [heirloom-pkgtools] minor release [1.0702= 27-7]. --- rel-eng/packages/heirloom-pkgtools | 2 +- spec-tree/heirloom-pkgtools/build.py.props | 3 +++ spec-tree/heirloom-pkgtools/heirloom-pkgtools.spec | 6 +++++- 3 files changed, 9 insertions(+), 2 deletions(-) --- --===============5620461167050091088==-- From adelton at fedoraproject.org Thu Aug 20 12:13:41 2015 Content-Type: multipart/mixed; boundary="===============3128592934775495959==" MIME-Version: 1.0 From: Jan Pazdziora To: spacewalk-commits at lists.fedorahosted.org Subject: spec-tree/heirloom-pkgtools Date: Tue, 11 Dec 2012 10:43:23 +0000 Message-ID: <20121211104323.BD421A0D86@fedorahosted.org> --===============3128592934775495959== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable spec-tree/heirloom-pkgtools/heirloom-pkgtools.spec | 7 = spec-tree/heirloom-pkgtools/use-flex.patch | 156 ++++++++++++++++= +++++ 2 files changed, 163 insertions(+) New commits: commit f33e57f25e0fc2efa55c34928a0a331d80133e2b Author: Jan Pazdziora Date: Tue Dec 11 11:43:09 2012 +0100 On Fedoras, use compat-flex and -lfl. diff --git a/spec-tree/heirloom-pkgtools/heirloom-pkgtools.spec b/spec-tree= /heirloom-pkgtools/heirloom-pkgtools.spec index 998b3c4..65df664 100644 --- a/spec-tree/heirloom-pkgtools/heirloom-pkgtools.spec +++ b/spec-tree/heirloom-pkgtools/heirloom-pkgtools.spec @@ -16,12 +16,16 @@ Patch3: binpath.patch Patch4: sbinpath.patch Patch5: cpio-D.patch Patch6: compute_checksum-64bit.patch +Patch7: use-flex.patch = BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) = BuildRequires: gcc BuildRequires: openssl-devel BuildRequires: flex +%if 0%{?fedora} +BuildRequires: compat-flex =3D 2.5.4a +%endif = %description Heirloom Packaging Tools are Linux ports of the SVR4 @@ -36,6 +40,9 @@ OpenSolaris. %patch4 -p1 %patch5 -p1 %patch6 -p1 +%if 0%{?fedora} +%patch7 -p1 +%endif = %build make -f makefile SHELL=3D/bin/bash CC=3Dgcc BINDIR=3D%{_bindir} SBINDIR=3D= %{_sbindir} diff --git a/spec-tree/heirloom-pkgtools/use-flex.patch b/spec-tree/heirloo= m-pkgtools/use-flex.patch new file mode 100644 index 0000000..b5b63b6 --- /dev/null +++ b/spec-tree/heirloom-pkgtools/use-flex.patch @@ -0,0 +1,156 @@ +diff -ru heirloom-pkgtools-070227.orig/pkgcmds/installf/Makefile.mk heirlo= om-pkgtools-070227/pkgcmds/installf/Makefile.mk +--- heirloom-pkgtools-070227.orig/pkgcmds/installf/Makefile.mk 2007-02-27 = 19:36:10.000000000 +0100 ++++ heirloom-pkgtools-070227/pkgcmds/installf/Makefile.mk 2012-12-11 11:17= :41.138065941 +0100 +@@ -6,7 +6,7 @@ + = + PKGLIBS =3D -L../../libinst -linst -L../../libpkg -lpkg -L../../libgendb = -lgendb \ + -L../../libadm -ladm -L../../libpkgdb -lpkgdb \ +- -L$(CCSDIR)/lib -ll ++ -L$(CCSDIR)/lib -L/usr/lib64/flex-2.5.4a -lfl + = + BIN =3D installf + OBJ =3D dofinal.o installf.o main.o removef.o ../../version/version.o +diff -ru heirloom-pkgtools-070227.orig/pkgcmds/pkgadd/Makefile.mk heirloom= -pkgtools-070227/pkgcmds/pkgadd/Makefile.mk +--- heirloom-pkgtools-070227.orig/pkgcmds/pkgadd/Makefile.mk 2007-02-27 19= :36:12.000000000 +0100 ++++ heirloom-pkgtools-070227/pkgcmds/pkgadd/Makefile.mk 2012-12-11 11:17:4= 1.138065941 +0100 +@@ -6,7 +6,7 @@ + = + PKGLIBS =3D -L../../libinst -linst -L../../libpkg -lpkg -L../../libgendb = -lgendb \ + -L../../libadm -ladm -L../../libpkgdb -lpkgdb \ +- -L$(CCSDIR)/lib -ll ++ -L$(CCSDIR)/lib -L/usr/lib64/flex-2.5.4a -lfl + = + BIN =3D pkgadd + OBJ =3D check.o main.o presvr4.o quit.o ../../version/version.o +diff -ru heirloom-pkgtools-070227.orig/pkgcmds/pkgadm/Makefile.mk heirloom= -pkgtools-070227/pkgcmds/pkgadm/Makefile.mk +--- heirloom-pkgtools-070227.orig/pkgcmds/pkgadm/Makefile.mk 2007-02-27 19= :36:14.000000000 +0100 ++++ heirloom-pkgtools-070227/pkgcmds/pkgadm/Makefile.mk 2012-12-11 11:17:4= 1.139065930 +0100 +@@ -6,7 +6,7 @@ + = + PKGLIBS =3D -L../../libinst -linst -L../../libpkg -lpkg -L../../libgendb = -lgendb \ + -L../../libadm -ladm -L../../libpkgdb -lpkgdb \ +- -L$(CCSDIR)/lib -ll ++ -L$(CCSDIR)/lib -L/usr/lib64/flex-2.5.4a -lfl + = + BIN =3D pkgadm + OBJ =3D addcert.o certs.o listcert.o lock.o main.o pkgadm_contents.o \ +diff -ru heirloom-pkgtools-070227.orig/pkgcmds/pkgchk/Makefile.mk heirloom= -pkgtools-070227/pkgcmds/pkgchk/Makefile.mk +--- heirloom-pkgtools-070227.orig/pkgcmds/pkgchk/Makefile.mk 2007-02-27 19= :36:16.000000000 +0100 ++++ heirloom-pkgtools-070227/pkgcmds/pkgchk/Makefile.mk 2012-12-11 11:17:4= 1.139065930 +0100 +@@ -6,7 +6,7 @@ + = + PKGLIBS =3D -L../../libinst -linst -L../../libpkg -lpkg -L../../libgendb = -lgendb \ + -L../../libadm -ladm -L../../libpkgdb -lpkgdb \ +- -L$(CCSDIR)/lib -ll ++ -L$(CCSDIR)/lib -L/usr/lib64/flex-2.5.4a -lfl + = + BIN =3D pkgchk + OBJ =3D checkmap.o ckentry.o main.o ../../version/version.o +diff -ru heirloom-pkgtools-070227.orig/pkgcmds/pkgcond/Makefile.mk heirloo= m-pkgtools-070227/pkgcmds/pkgcond/Makefile.mk +--- heirloom-pkgtools-070227.orig/pkgcmds/pkgcond/Makefile.mk 2007-02-27 1= 9:36:18.000000000 +0100 ++++ heirloom-pkgtools-070227/pkgcmds/pkgcond/Makefile.mk 2012-12-11 11:17:= 41.140065919 +0100 +@@ -6,7 +6,7 @@ + = + PKGLIBS =3D -L../../libinst -linst -L../../libpkg -lpkg -L../../libgendb = -lgendb \ + -L../../libadm -ladm -L../../libpkgdb -lpkgdb \ +- -L$(CCSDIR)/lib -ll ++ -L$(CCSDIR)/lib -L/usr/lib64/flex-2.5.4a -lfl + = + BIN =3D pkgcond + OBJ =3D main.o ../../version/version.o +diff -ru heirloom-pkgtools-070227.orig/pkgcmds/pkginstall/Makefile.mk heir= loom-pkgtools-070227/pkgcmds/pkginstall/Makefile.mk +--- heirloom-pkgtools-070227.orig/pkgcmds/pkginstall/Makefile.mk 2007-02-2= 7 19:36:22.000000000 +0100 ++++ heirloom-pkgtools-070227/pkgcmds/pkginstall/Makefile.mk 2012-12-11 11:= 17:41.139065930 +0100 +@@ -6,7 +6,7 @@ + = + PKGLIBS =3D -L../../libinst -linst -L../../libpkg -lpkg -L../../libgendb = -lgendb \ + -L../../libadm -ladm -L../../libpkgdb -lpkgdb \ +- -L$(CCSDIR)/lib -ll ++ -L$(CCSDIR)/lib -L/usr/lib64/flex-2.5.4a -lfl + = + BIN =3D pkginstall + OBJ =3D backup.o check.o cppath.o dockspace.o getinst.o instvol.o main.o \ +diff -ru heirloom-pkgtools-070227.orig/pkgcmds/pkgmk/Makefile.mk heirloom-= pkgtools-070227/pkgcmds/pkgmk/Makefile.mk +--- heirloom-pkgtools-070227.orig/pkgcmds/pkgmk/Makefile.mk 2007-02-27 19:= 36:24.000000000 +0100 ++++ heirloom-pkgtools-070227/pkgcmds/pkgmk/Makefile.mk 2012-12-11 11:17:41= .139065930 +0100 +@@ -6,7 +6,7 @@ + = + PKGLIBS =3D -L../../libinst -linst -L../../libpkg -lpkg -L../../libgendb = -lgendb \ + -L../../libadm -ladm -L../../libpkgdb -lpkgdb \ +- -L$(CCSDIR)/lib -ll ++ -L$(CCSDIR)/lib -L/usr/lib64/flex-2.5.4a -lfl + = + BIN =3D pkgmk + OBJ =3D main.o mkpkgmap.o quit.o splpkgmap.o ../../version/version.o +diff -ru heirloom-pkgtools-070227.orig/pkgcmds/pkgname/Makefile.mk heirloo= m-pkgtools-070227/pkgcmds/pkgname/Makefile.mk +--- heirloom-pkgtools-070227.orig/pkgcmds/pkgname/Makefile.mk 2007-02-27 1= 9:36:26.000000000 +0100 ++++ heirloom-pkgtools-070227/pkgcmds/pkgname/Makefile.mk 2012-12-11 11:17:= 41.138065941 +0100 +@@ -6,7 +6,7 @@ + = + PKGLIBS =3D -L../../libinst -linst -L../../libpkg -lpkg -L../../libgendb = -lgendb \ + -L../../libadm -ladm -L../../libpkgdb -lpkgdb \ +- -L$(CCSDIR)/lib -ll ++ -L$(CCSDIR)/lib -L/usr/lib64/flex-2.5.4a -lfl + = + BIN =3D pkgname + OBJ =3D pkgname.o ../../version/version.o +diff -ru heirloom-pkgtools-070227.orig/pkgcmds/pkgparam/Makefile.mk heirlo= om-pkgtools-070227/pkgcmds/pkgparam/Makefile.mk +--- heirloom-pkgtools-070227.orig/pkgcmds/pkgparam/Makefile.mk 2007-02-27 = 19:36:28.000000000 +0100 ++++ heirloom-pkgtools-070227/pkgcmds/pkgparam/Makefile.mk 2012-12-11 11:17= :41.139065930 +0100 +@@ -6,7 +6,7 @@ + = + PKGLIBS =3D -L../../libinst -linst -L../../libpkg -lpkg -L../../libgendb = -lgendb \ + -L../../libadm -ladm -L../../libpkgdb -lpkgdb \ +- -L$(CCSDIR)/lib -ll ++ -L$(CCSDIR)/lib -L/usr/lib64/flex-2.5.4a -lfl + = + BIN =3D pkgparam + OBJ =3D pkgparam.o ../../version/version.o +diff -ru heirloom-pkgtools-070227.orig/pkgcmds/pkgremove/Makefile.mk heirl= oom-pkgtools-070227/pkgcmds/pkgremove/Makefile.mk +--- heirloom-pkgtools-070227.orig/pkgcmds/pkgremove/Makefile.mk 2007-02-27= 19:36:33.000000000 +0100 ++++ heirloom-pkgtools-070227/pkgcmds/pkgremove/Makefile.mk 2012-12-11 11:1= 7:41.140065919 +0100 +@@ -6,7 +6,7 @@ + = + PKGLIBS =3D -L../../libinst -linst -L../../libpkg -lpkg -L../../libgendb = -lgendb \ + -L../../libadm -ladm -L../../libpkgdb -lpkgdb \ +- -L$(CCSDIR)/lib -ll ++ -L$(CCSDIR)/lib -L/usr/lib64/flex-2.5.4a -lfl + = + BIN =3D pkgremove + OBJ =3D check.o delmap.o main.o predepend.o quit.o special.o wsreg_pkgrm.= o ../../version/version.o +diff -ru heirloom-pkgtools-070227.orig/pkgcmds/pkgrm/Makefile.mk heirloom-= pkgtools-070227/pkgcmds/pkgrm/Makefile.mk +--- heirloom-pkgtools-070227.orig/pkgcmds/pkgrm/Makefile.mk 2007-02-27 19:= 36:35.000000000 +0100 ++++ heirloom-pkgtools-070227/pkgcmds/pkgrm/Makefile.mk 2012-12-11 11:17:41= .140065919 +0100 +@@ -6,7 +6,7 @@ + = + PKGLIBS =3D -L../../libinst -linst -L../../libpkg -lpkg -L../../libgendb = -lgendb \ + -L../../libadm -ladm -L../../libpkgdb -lpkgdb \ +- -L$(CCSDIR)/lib -ll ++ -L$(CCSDIR)/lib -L/usr/lib64/flex-2.5.4a -lfl + = + BIN =3D pkgrm + OBJ =3D check.o main.o presvr4.o quit.o ../../version/version.o +diff -ru heirloom-pkgtools-070227.orig/pkgcmds/pkgscripts/Makefile.mk heir= loom-pkgtools-070227/pkgcmds/pkgscripts/Makefile.mk +--- heirloom-pkgtools-070227.orig/pkgcmds/pkgscripts/Makefile.mk 2007-02-2= 7 19:36:37.000000000 +0100 ++++ heirloom-pkgtools-070227/pkgcmds/pkgscripts/Makefile.mk 2012-12-11 11:= 17:41.139065930 +0100 +@@ -6,7 +6,7 @@ + = + PKGLIBS =3D -L../../libinst -linst -L../../libpkg -lpkg -L../../libgendb = -lgendb \ + -L../../libadm -ladm -L../../libpkgdb -lpkgdb \ +- -L$(CCSDIR)/lib -ll ++ -L$(CCSDIR)/lib -L/usr/lib64/flex-2.5.4a -lfl + = + BIN =3D cmdexec + OBJ =3D cmdexec.o ../../version/version.o +diff -ru heirloom-pkgtools-070227.orig/pkgcmds/pkgtrans/Makefile.mk heirlo= om-pkgtools-070227/pkgcmds/pkgtrans/Makefile.mk +--- heirloom-pkgtools-070227.orig/pkgcmds/pkgtrans/Makefile.mk 2007-02-27 = 19:36:39.000000000 +0100 ++++ heirloom-pkgtools-070227/pkgcmds/pkgtrans/Makefile.mk 2012-12-11 11:17= :41.140065919 +0100 +@@ -6,7 +6,7 @@ + = + PKGLIBS =3D -L../../libinst -linst -L../../libpkg -lpkg -L../../libgendb = -lgendb \ + -L../../libadm -ladm -L../../libpkgdb -lpkgdb \ +- -L$(CCSDIR)/lib -ll ++ -L$(CCSDIR)/lib -L/usr/lib64/flex-2.5.4a -lfl + = + BIN =3D pkgtrans + OBJ =3D main.o ../../version/version.o --===============3128592934775495959==-- From adelton at fedoraproject.org Thu Aug 20 12:13:41 2015 Content-Type: multipart/mixed; boundary="===============1249441267529497854==" MIME-Version: 1.0 From: Jan Pazdziora To: spacewalk-commits at lists.fedorahosted.org Subject: rel-eng/packages spec-tree/heirloom-pkgtools Date: Tue, 11 Dec 2012 10:43:41 +0000 Message-ID: <20121211104341.DEDD316D0@hosted02.fedoraproject.org> --===============1249441267529497854== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable rel-eng/packages/heirloom-pkgtools | 2 +- spec-tree/heirloom-pkgtools/heirloom-pkgtools.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) New commits: commit 24956a91429562c3dc921af3b30aa810bb3b3e10 Author: Jan Pazdziora Date: Tue Dec 11 11:43:31 2012 +0100 Automatic commit of package [heirloom-pkgtools] minor release [1.070227= -8]. diff --git a/rel-eng/packages/heirloom-pkgtools b/rel-eng/packages/heirloom= -pkgtools index c4ac6d5..8310cfb 100644 --- a/rel-eng/packages/heirloom-pkgtools +++ b/rel-eng/packages/heirloom-pkgtools @@ -1 +1 @@ -1.070227-7 spec-tree/heirloom-pkgtools/ +1.070227-8 spec-tree/heirloom-pkgtools/ diff --git a/spec-tree/heirloom-pkgtools/heirloom-pkgtools.spec b/spec-tree= /heirloom-pkgtools/heirloom-pkgtools.spec index 65df664..879c46b 100644 --- a/spec-tree/heirloom-pkgtools/heirloom-pkgtools.spec +++ b/spec-tree/heirloom-pkgtools/heirloom-pkgtools.spec @@ -6,7 +6,7 @@ Summary: Heirloom Packaging Tools Group: Development/Tools License: CDDL Version: 1.%{heriloom_pkgtools_version} -Release: 7%{?dist} +Release: 8%{?dist} = URL: http://heirloom.sourceforge.net/pkgtools.html Source0: %{name}-%{heriloom_pkgtools_version}.tar.bz2 @@ -104,6 +104,9 @@ rm -rf $RPM_BUILD_ROOT %{_var}/sadm/install/admin/default = %changelog +* Tue Dec 11 2012 Jan Pazdziora 1.070227-8 +- On Fedoras, use compat-flex and -lfl. + * Tue Dec 11 2012 Jan Pazdziora 1.070227-7 - set correct tagger for heirloom-pkgtools - set correct builder for heirloom-pkgtools --===============1249441267529497854==-- From adelton at fedoraproject.org Thu Aug 20 12:13:41 2015 Content-Type: multipart/mixed; boundary="===============3289966223605743015==" MIME-Version: 1.0 From: Jan Pazdziora To: spacewalk-commits at lists.fedorahosted.org Subject: Changes to 'refs/tags/heirloom-pkgtools-1.070227-8' Date: Tue, 11 Dec 2012 10:43:49 +0000 Message-ID: <20121211104349.2A62916D0@hosted02.fedoraproject.org> --===============3289966223605743015== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Tag 'heirloom-pkgtools-1.070227-8' created by Jan Pazdziora at 2012-12-11 10:43 +0000 Tagging package [heirloom-pkgtools] version [1.070227-8] in directory [spec= -tree/heirloom-pkgtools/]. Changes since heirloom-pkgtools-1.070227-7: Jan Pazdziora (2): On Fedoras, use compat-flex and -lfl. Automatic commit of package [heirloom-pkgtools] minor release [1.0702= 27-8]. --- rel-eng/packages/heirloom-pkgtools | 2 = spec-tree/heirloom-pkgtools/heirloom-pkgtools.spec | 12 + spec-tree/heirloom-pkgtools/use-flex.patch | 156 ++++++++++++++++= +++++ 3 files changed, 168 insertions(+), 2 deletions(-) --- --===============3289966223605743015==-- From adelton at fedoraproject.org Thu Aug 20 12:13:41 2015 Content-Type: multipart/mixed; boundary="===============0311394959863529826==" MIME-Version: 1.0 From: Jan Pazdziora To: spacewalk-commits at lists.fedorahosted.org Subject: 2 commits - rel-eng/packages spec-tree/heirloom-pkgtools Date: Tue, 11 Dec 2012 10:47:42 +0000 Message-ID: <20121211104742.5D5ECA0D86@fedorahosted.org> --===============0311394959863529826== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable rel-eng/packages/heirloom-pkgtools | 2 - spec-tree/heirloom-pkgtools/heirloom-pkgtools.spec | 5 +++- spec-tree/heirloom-pkgtools/use-flex.patch | 26 ++++++++++------= ----- 3 files changed, 18 insertions(+), 15 deletions(-) New commits: commit eff1d069bb7939848668d4f9de27d81221afb612 Author: Jan Pazdziora Date: Tue Dec 11 11:47:32 2012 +0100 Automatic commit of package [heirloom-pkgtools] minor release [1.070227= -9]. diff --git a/rel-eng/packages/heirloom-pkgtools b/rel-eng/packages/heirloom= -pkgtools index 8310cfb..c280f9c 100644 --- a/rel-eng/packages/heirloom-pkgtools +++ b/rel-eng/packages/heirloom-pkgtools @@ -1 +1 @@ -1.070227-8 spec-tree/heirloom-pkgtools/ +1.070227-9 spec-tree/heirloom-pkgtools/ diff --git a/spec-tree/heirloom-pkgtools/heirloom-pkgtools.spec b/spec-tree= /heirloom-pkgtools/heirloom-pkgtools.spec index 879c46b..beb4917 100644 --- a/spec-tree/heirloom-pkgtools/heirloom-pkgtools.spec +++ b/spec-tree/heirloom-pkgtools/heirloom-pkgtools.spec @@ -6,7 +6,7 @@ Summary: Heirloom Packaging Tools Group: Development/Tools License: CDDL Version: 1.%{heriloom_pkgtools_version} -Release: 8%{?dist} +Release: 9%{?dist} = URL: http://heirloom.sourceforge.net/pkgtools.html Source0: %{name}-%{heriloom_pkgtools_version}.tar.bz2 @@ -104,6 +104,9 @@ rm -rf $RPM_BUILD_ROOT %{_var}/sadm/install/admin/default = %changelog +* Tue Dec 11 2012 Jan Pazdziora 1.070227-9 +- Walk both 32bit and 64bit paths. + * Tue Dec 11 2012 Jan Pazdziora 1.070227-8 - On Fedoras, use compat-flex and -lfl. = commit 47e4ef6bbec0eb87865b6101916aba370b1e8d50 Author: Jan Pazdziora Date: Tue Dec 11 11:47:27 2012 +0100 Walk both 32bit and 64bit paths. diff --git a/spec-tree/heirloom-pkgtools/use-flex.patch b/spec-tree/heirloo= m-pkgtools/use-flex.patch index b5b63b6..4f6ff9d 100644 --- a/spec-tree/heirloom-pkgtools/use-flex.patch +++ b/spec-tree/heirloom-pkgtools/use-flex.patch @@ -6,7 +6,7 @@ diff -ru heirloom-pkgtools-070227.orig/pkgcmds/installf/Mak= efile.mk heirloom-pkg PKGLIBS =3D -L../../libinst -linst -L../../libpkg -lpkg -L../../libgendb = -lgendb \ -L../../libadm -ladm -L../../libpkgdb -lpkgdb \ - -L$(CCSDIR)/lib -ll -+ -L$(CCSDIR)/lib -L/usr/lib64/flex-2.5.4a -lfl ++ -L$(CCSDIR)/lib -L/usr/lib/flex-2.5.4a -L/usr/lib64/flex-2.5.4a -lfl = BIN =3D installf OBJ =3D dofinal.o installf.o main.o removef.o ../../version/version.o @@ -18,7 +18,7 @@ diff -ru heirloom-pkgtools-070227.orig/pkgcmds/pkgadd/Mak= efile.mk heirloom-pkgto PKGLIBS =3D -L../../libinst -linst -L../../libpkg -lpkg -L../../libgendb = -lgendb \ -L../../libadm -ladm -L../../libpkgdb -lpkgdb \ - -L$(CCSDIR)/lib -ll -+ -L$(CCSDIR)/lib -L/usr/lib64/flex-2.5.4a -lfl ++ -L$(CCSDIR)/lib -L/usr/lib/flex-2.5.4a -L/usr/lib64/flex-2.5.4a -lfl = BIN =3D pkgadd OBJ =3D check.o main.o presvr4.o quit.o ../../version/version.o @@ -30,7 +30,7 @@ diff -ru heirloom-pkgtools-070227.orig/pkgcmds/pkgadm/Mak= efile.mk heirloom-pkgto PKGLIBS =3D -L../../libinst -linst -L../../libpkg -lpkg -L../../libgendb = -lgendb \ -L../../libadm -ladm -L../../libpkgdb -lpkgdb \ - -L$(CCSDIR)/lib -ll -+ -L$(CCSDIR)/lib -L/usr/lib64/flex-2.5.4a -lfl ++ -L$(CCSDIR)/lib -L/usr/lib/flex-2.5.4a -L/usr/lib64/flex-2.5.4a -lfl = BIN =3D pkgadm OBJ =3D addcert.o certs.o listcert.o lock.o main.o pkgadm_contents.o \ @@ -42,7 +42,7 @@ diff -ru heirloom-pkgtools-070227.orig/pkgcmds/pkgchk/Mak= efile.mk heirloom-pkgto PKGLIBS =3D -L../../libinst -linst -L../../libpkg -lpkg -L../../libgendb = -lgendb \ -L../../libadm -ladm -L../../libpkgdb -lpkgdb \ - -L$(CCSDIR)/lib -ll -+ -L$(CCSDIR)/lib -L/usr/lib64/flex-2.5.4a -lfl ++ -L$(CCSDIR)/lib -L/usr/lib/flex-2.5.4a -L/usr/lib64/flex-2.5.4a -lfl = BIN =3D pkgchk OBJ =3D checkmap.o ckentry.o main.o ../../version/version.o @@ -54,7 +54,7 @@ diff -ru heirloom-pkgtools-070227.orig/pkgcmds/pkgcond/Ma= kefile.mk heirloom-pkgt PKGLIBS =3D -L../../libinst -linst -L../../libpkg -lpkg -L../../libgendb = -lgendb \ -L../../libadm -ladm -L../../libpkgdb -lpkgdb \ - -L$(CCSDIR)/lib -ll -+ -L$(CCSDIR)/lib -L/usr/lib64/flex-2.5.4a -lfl ++ -L$(CCSDIR)/lib -L/usr/lib/flex-2.5.4a -L/usr/lib64/flex-2.5.4a -lfl = BIN =3D pkgcond OBJ =3D main.o ../../version/version.o @@ -66,7 +66,7 @@ diff -ru heirloom-pkgtools-070227.orig/pkgcmds/pkginstall= /Makefile.mk heirloom-p PKGLIBS =3D -L../../libinst -linst -L../../libpkg -lpkg -L../../libgendb = -lgendb \ -L../../libadm -ladm -L../../libpkgdb -lpkgdb \ - -L$(CCSDIR)/lib -ll -+ -L$(CCSDIR)/lib -L/usr/lib64/flex-2.5.4a -lfl ++ -L$(CCSDIR)/lib -L/usr/lib/flex-2.5.4a -L/usr/lib64/flex-2.5.4a -lfl = BIN =3D pkginstall OBJ =3D backup.o check.o cppath.o dockspace.o getinst.o instvol.o main.o \ @@ -78,7 +78,7 @@ diff -ru heirloom-pkgtools-070227.orig/pkgcmds/pkgmk/Make= file.mk heirloom-pkgtoo PKGLIBS =3D -L../../libinst -linst -L../../libpkg -lpkg -L../../libgendb = -lgendb \ -L../../libadm -ladm -L../../libpkgdb -lpkgdb \ - -L$(CCSDIR)/lib -ll -+ -L$(CCSDIR)/lib -L/usr/lib64/flex-2.5.4a -lfl ++ -L$(CCSDIR)/lib -L/usr/lib/flex-2.5.4a -L/usr/lib64/flex-2.5.4a -lfl = BIN =3D pkgmk OBJ =3D main.o mkpkgmap.o quit.o splpkgmap.o ../../version/version.o @@ -90,7 +90,7 @@ diff -ru heirloom-pkgtools-070227.orig/pkgcmds/pkgname/Ma= kefile.mk heirloom-pkgt PKGLIBS =3D -L../../libinst -linst -L../../libpkg -lpkg -L../../libgendb = -lgendb \ -L../../libadm -ladm -L../../libpkgdb -lpkgdb \ - -L$(CCSDIR)/lib -ll -+ -L$(CCSDIR)/lib -L/usr/lib64/flex-2.5.4a -lfl ++ -L$(CCSDIR)/lib -L/usr/lib/flex-2.5.4a -L/usr/lib64/flex-2.5.4a -lfl = BIN =3D pkgname OBJ =3D pkgname.o ../../version/version.o @@ -102,7 +102,7 @@ diff -ru heirloom-pkgtools-070227.orig/pkgcmds/pkgparam= /Makefile.mk heirloom-pkg PKGLIBS =3D -L../../libinst -linst -L../../libpkg -lpkg -L../../libgendb = -lgendb \ -L../../libadm -ladm -L../../libpkgdb -lpkgdb \ - -L$(CCSDIR)/lib -ll -+ -L$(CCSDIR)/lib -L/usr/lib64/flex-2.5.4a -lfl ++ -L$(CCSDIR)/lib -L/usr/lib/flex-2.5.4a -L/usr/lib64/flex-2.5.4a -lfl = BIN =3D pkgparam OBJ =3D pkgparam.o ../../version/version.o @@ -114,7 +114,7 @@ diff -ru heirloom-pkgtools-070227.orig/pkgcmds/pkgremov= e/Makefile.mk heirloom-pk PKGLIBS =3D -L../../libinst -linst -L../../libpkg -lpkg -L../../libgendb = -lgendb \ -L../../libadm -ladm -L../../libpkgdb -lpkgdb \ - -L$(CCSDIR)/lib -ll -+ -L$(CCSDIR)/lib -L/usr/lib64/flex-2.5.4a -lfl ++ -L$(CCSDIR)/lib -L/usr/lib/flex-2.5.4a -L/usr/lib64/flex-2.5.4a -lfl = BIN =3D pkgremove OBJ =3D check.o delmap.o main.o predepend.o quit.o special.o wsreg_pkgrm.= o ../../version/version.o @@ -126,7 +126,7 @@ diff -ru heirloom-pkgtools-070227.orig/pkgcmds/pkgrm/Ma= kefile.mk heirloom-pkgtoo PKGLIBS =3D -L../../libinst -linst -L../../libpkg -lpkg -L../../libgendb = -lgendb \ -L../../libadm -ladm -L../../libpkgdb -lpkgdb \ - -L$(CCSDIR)/lib -ll -+ -L$(CCSDIR)/lib -L/usr/lib64/flex-2.5.4a -lfl ++ -L$(CCSDIR)/lib -L/usr/lib/flex-2.5.4a -L/usr/lib64/flex-2.5.4a -lfl = BIN =3D pkgrm OBJ =3D check.o main.o presvr4.o quit.o ../../version/version.o @@ -138,7 +138,7 @@ diff -ru heirloom-pkgtools-070227.orig/pkgcmds/pkgscrip= ts/Makefile.mk heirloom-p PKGLIBS =3D -L../../libinst -linst -L../../libpkg -lpkg -L../../libgendb = -lgendb \ -L../../libadm -ladm -L../../libpkgdb -lpkgdb \ - -L$(CCSDIR)/lib -ll -+ -L$(CCSDIR)/lib -L/usr/lib64/flex-2.5.4a -lfl ++ -L$(CCSDIR)/lib -L/usr/lib/flex-2.5.4a -L/usr/lib64/flex-2.5.4a -lfl = BIN =3D cmdexec OBJ =3D cmdexec.o ../../version/version.o @@ -150,7 +150,7 @@ diff -ru heirloom-pkgtools-070227.orig/pkgcmds/pkgtrans= /Makefile.mk heirloom-pkg PKGLIBS =3D -L../../libinst -linst -L../../libpkg -lpkg -L../../libgendb = -lgendb \ -L../../libadm -ladm -L../../libpkgdb -lpkgdb \ - -L$(CCSDIR)/lib -ll -+ -L$(CCSDIR)/lib -L/usr/lib64/flex-2.5.4a -lfl ++ -L$(CCSDIR)/lib -L/usr/lib/flex-2.5.4a -L/usr/lib64/flex-2.5.4a -lfl = BIN =3D pkgtrans OBJ =3D main.o ../../version/version.o --===============0311394959863529826==-- From adelton at fedoraproject.org Thu Aug 20 12:13:41 2015 Content-Type: multipart/mixed; boundary="===============4059161948184682930==" MIME-Version: 1.0 From: Jan Pazdziora To: spacewalk-commits at lists.fedorahosted.org Subject: Changes to 'refs/tags/heirloom-pkgtools-1.070227-9' Date: Tue, 11 Dec 2012 10:59:53 +0000 Message-ID: <20121211105953.5477F12D4@hosted02.fedoraproject.org> --===============4059161948184682930== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Tag 'heirloom-pkgtools-1.070227-9' created by Jan Pazdziora at 2012-12-11 10:47 +0000 Tagging package [heirloom-pkgtools] version [1.070227-9] in directory [spec= -tree/heirloom-pkgtools/]. Changes since heirloom-pkgtools-1.070227-8: Jan Pazdziora (2): Walk both 32bit and 64bit paths. Automatic commit of package [heirloom-pkgtools] minor release [1.0702= 27-9]. --- rel-eng/packages/heirloom-pkgtools | 2 - spec-tree/heirloom-pkgtools/heirloom-pkgtools.spec | 5 +++- spec-tree/heirloom-pkgtools/use-flex.patch | 26 ++++++++++------= ----- 3 files changed, 18 insertions(+), 15 deletions(-) --- --===============4059161948184682930==-- From adelton at fedoraproject.org Thu Aug 20 12:13:41 2015 Content-Type: multipart/mixed; boundary="===============8690614669114379411==" MIME-Version: 1.0 From: Jan Pazdziora To: spacewalk-commits at lists.fedorahosted.org Subject: rel-eng/comps rel-eng/tito.props Date: Tue, 11 Dec 2012 12:19:11 +0000 Message-ID: <20121211121911.40E0EAABA5@fedorahosted.org> --===============8690614669114379411== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable rel-eng/comps/comps-spacewalk-server-fedora16.xml | 1 + rel-eng/comps/comps-spacewalk-server-fedora17.xml | 1 + rel-eng/comps/comps-spacewalk-server-rhel5.xml | 1 + rel-eng/comps/comps-spacewalk-server-rhel6.xml | 1 + rel-eng/tito.props | 8 ++++---- 5 files changed, 8 insertions(+), 4 deletions(-) New commits: commit 38e49da7a51968a62903156f5b8c1c623a1fc589 Author: Jan Pazdziora Date: Tue Dec 11 13:18:59 2012 +0100 Put heirloom-pkgtools back to composes. diff --git a/rel-eng/comps/comps-spacewalk-server-fedora16.xml b/rel-eng/co= mps/comps-spacewalk-server-fedora16.xml index 3ce3ba9..5744239 100644 --- a/rel-eng/comps/comps-spacewalk-server-fedora16.xml +++ b/rel-eng/comps/comps-spacewalk-server-fedora16.xml @@ -25,6 +25,7 @@ cx_Oracle dwr eventReceivers + heirloom-pkgtools jpam MessageQueue nocpulse-common diff --git a/rel-eng/comps/comps-spacewalk-server-fedora17.xml b/rel-eng/co= mps/comps-spacewalk-server-fedora17.xml index 3ce3ba9..5744239 100644 --- a/rel-eng/comps/comps-spacewalk-server-fedora17.xml +++ b/rel-eng/comps/comps-spacewalk-server-fedora17.xml @@ -25,6 +25,7 @@ cx_Oracle dwr eventReceivers + heirloom-pkgtools jpam MessageQueue nocpulse-common diff --git a/rel-eng/comps/comps-spacewalk-server-rhel5.xml b/rel-eng/comps= /comps-spacewalk-server-rhel5.xml index 92e199a..6ea46ba 100644 --- a/rel-eng/comps/comps-spacewalk-server-rhel5.xml +++ b/rel-eng/comps/comps-spacewalk-server-rhel5.xml @@ -39,6 +39,7 @@ dom4j-repolib dwr eventReceivers + heirloom-pkgtools hibernate3 hibernate3-manual hibernate3-repolib diff --git a/rel-eng/comps/comps-spacewalk-server-rhel6.xml b/rel-eng/comps= /comps-spacewalk-server-rhel6.xml index 8239386..ba80d1e 100644 --- a/rel-eng/comps/comps-spacewalk-server-rhel6.xml +++ b/rel-eng/comps/comps-spacewalk-server-rhel6.xml @@ -25,6 +25,7 @@ cx_Oracle dwr eventReceivers + heirloom-pkgtools jpam MessageQueue nocpulse-common diff --git a/rel-eng/tito.props b/rel-eng/tito.props index aab7e20..2bc79c1 100644 --- a/rel-eng/tito.props +++ b/rel-eng/tito.props @@ -10,16 +10,16 @@ autobuild_tags =3D spacewalk-nightly-rhel5 spacewalk-ni= ghtly-rhel6 spacewalk-night = [spacewalk-nightly-rhel5] disttag =3D .el5 -blacklist=3Doracle-server-admin oracle-server-scripts rhnclient smartpm he= irloom-pkgtools oracle-rhnsat-selinux spacewalk-jpp-workaround apt-spacewal= k python-hwdata spacewalk-oro-compat +blacklist=3Doracle-server-admin oracle-server-scripts rhnclient smartpm or= acle-rhnsat-selinux spacewalk-jpp-workaround apt-spacewalk python-hwdata sp= acewalk-oro-compat = [spacewalk-nightly-rhel6] disttag =3D .el6 -blacklist=3Doracle-server-admin oracle-server-scripts rhnclient smartpm he= irloom-pkgtools oracle-rhnsat-selinux jabberd-selinux apt-spacewalk python-= hwdata spacewalk-oro-compat +blacklist=3Doracle-server-admin oracle-server-scripts rhnclient smartpm or= acle-rhnsat-selinux jabberd-selinux apt-spacewalk python-hwdata spacewalk-o= ro-compat = [spacewalk-nightly-fedora16] disttag =3D .fc16 -blacklist=3Djabberd-selinux oracle-server-admin oracle-server-scripts rhnc= lient smartpm apt-spacewalk python-hwdata heirloom-pkgtools oracle-rhnsat-s= elinux +blacklist=3Djabberd-selinux oracle-server-admin oracle-server-scripts rhnc= lient smartpm apt-spacewalk python-hwdata oracle-rhnsat-selinux = [spacewalk-nightly-fedora17] disttag =3D .fc17 -blacklist=3Djabberd-selinux oracle-server-admin oracle-server-scripts rhnc= lient smartpm apt-spacewalk python-hwdata heirloom-pkgtools oracle-rhnsat-s= elinux +blacklist=3Djabberd-selinux oracle-server-admin oracle-server-scripts rhnc= lient smartpm apt-spacewalk python-hwdata oracle-rhnsat-selinux --===============8690614669114379411==-- From isimluk at fedoraproject.org Thu Aug 20 12:13:41 2015 Content-Type: multipart/mixed; boundary="===============7173538045966701087==" MIME-Version: 1.0 From: =?utf-8?q?=C5=A0imon_Luka=C5=A1=C3=ADk_=3Cisimluk_at_fedoraproject=2Eorg?= =?utf-8?q?=3E?= To: spacewalk-commits at lists.fedorahosted.org Subject: client/rhel Date: Tue, 11 Dec 2012 13:29:14 +0000 Message-ID: <20121211132915.06556A0D86@fedorahosted.org> --===============7173538045966701087== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable client/rhel/spacewalk-oscap/scap.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) New commits: commit 1a3f72077e3ec5bbaa786a4b9755e8f1be53357c Author: Simon Lukasik Date: Tue Dec 11 13:52:42 2012 +0100 Allow --cpe command-line argument to oscap. = Sadly, the --cpe-dict and --cpe-dict2 arguments has been only in OpenSCAP 0.9.1 and has been merged together in OpenSCAP 0.9.2. diff --git a/client/rhel/spacewalk-oscap/scap.py b/client/rhel/spacewalk-os= cap/scap.py index 10106fd..6cd4f6b 100644 --- a/client/rhel/spacewalk-oscap/scap.py +++ b/client/rhel/spacewalk-oscap/scap.py @@ -62,8 +62,7 @@ def _process_params(args, filename): allowed_args =3D { '--profile': 1, '--skip-valid': 0, - '--cpe-dict': 1, - '--cpe-dict2': 1, + '--cpe': 1, '--fetch-remote-resources': 0, '--datastream-id': 1, '--xccdf-id': 1, --===============7173538045966701087==-- From isimluk at fedoraproject.org Thu Aug 20 12:13:41 2015 Content-Type: multipart/mixed; boundary="===============4844948515561284827==" MIME-Version: 1.0 From: =?utf-8?q?=C5=A0imon_Luka=C5=A1=C3=ADk_=3Cisimluk_at_fedoraproject=2Eorg?= =?utf-8?q?=3E?= To: spacewalk-commits at lists.fedorahosted.org Subject: client/rhel rel-eng/packages Date: Tue, 11 Dec 2012 13:29:54 +0000 Message-ID: <20121211132954.F027BA0D86@fedorahosted.org> --===============4844948515561284827== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable client/rhel/spacewalk-oscap/spacewalk-oscap.spec | 5 ++++- rel-eng/packages/spacewalk-oscap | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) New commits: commit 84e66fbf72caf95a45aeca374c08bcfaf13d93f0 Author: Simon Lukasik Date: Tue Dec 11 14:29:35 2012 +0100 Automatic commit of package [spacewalk-oscap] release [0.0.12-1]. diff --git a/client/rhel/spacewalk-oscap/spacewalk-oscap.spec b/client/rhel= /spacewalk-oscap/spacewalk-oscap.spec index 7eaa9cd..85cb910 100644 --- a/client/rhel/spacewalk-oscap/spacewalk-oscap.spec +++ b/client/rhel/spacewalk-oscap/spacewalk-oscap.spec @@ -1,5 +1,5 @@ Name: spacewalk-oscap -Version: 0.0.11 +Version: 0.0.12 Release: 1%{?dist} Summary: OpenSCAP plug-in for rhn-check = @@ -42,6 +42,9 @@ rm -rf $RPM_BUILD_ROOT = = %changelog +* Tue Dec 11 2012 Simon Lukasik 0.0.12-1 +- Allow --cpe command-line argument to oscap. + * Thu Nov 01 2012 Jan Pazdziora 0.0.11-1 - 872248: Enable new `oscap' features in spacewalk-openscap. = diff --git a/rel-eng/packages/spacewalk-oscap b/rel-eng/packages/spacewalk-= oscap index 5867a10..b95d4db 100644 --- a/rel-eng/packages/spacewalk-oscap +++ b/rel-eng/packages/spacewalk-oscap @@ -1 +1 @@ -0.0.11-1 client/rhel/spacewalk-oscap/ +0.0.12-1 client/rhel/spacewalk-oscap/ --===============4844948515561284827==-- From isimluk at fedoraproject.org Thu Aug 20 12:13:41 2015 Content-Type: multipart/mixed; boundary="===============1737518718892351101==" MIME-Version: 1.0 From: =?utf-8?q?=C5=A0imon_Luka=C5=A1=C3=ADk_=3Cisimluk_at_fedoraproject=2Eorg?= =?utf-8?q?=3E?= To: spacewalk-commits at lists.fedorahosted.org Subject: Changes to 'refs/tags/spacewalk-oscap-0.0.12-1' Date: Tue, 11 Dec 2012 13:30:08 +0000 Message-ID: <20121211133008.E030E2091@hosted02.fedoraproject.org> --===============1737518718892351101== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Tag 'spacewalk-oscap-0.0.12-1' created by Simon Lukasik at 2012-12-11 13:29 +0000 Tagging package [spacewalk-oscap] version [0.0.12-1] in directory [client/r= hel/spacewalk-oscap/]. Changes since heirloom-pkgtools-1.070227-9: Jan Pazdziora (1): Put heirloom-pkgtools back to composes. Simon Lukasik (2): Allow --cpe command-line argument to oscap. Automatic commit of package [spacewalk-oscap] release [0.0.12-1]. --- client/rhel/spacewalk-oscap/scap.py | 3 +-- client/rhel/spacewalk-oscap/spacewalk-oscap.spec | 5 ++++- rel-eng/comps/comps-spacewalk-server-fedora16.xml | 1 + rel-eng/comps/comps-spacewalk-server-fedora17.xml | 1 + rel-eng/comps/comps-spacewalk-server-rhel5.xml | 1 + rel-eng/comps/comps-spacewalk-server-rhel6.xml | 1 + rel-eng/packages/spacewalk-oscap | 2 +- rel-eng/tito.props | 8 ++++---- 8 files changed, 14 insertions(+), 8 deletions(-) --- --===============1737518718892351101==-- From isimluk at fedoraproject.org Thu Aug 20 12:13:41 2015 Content-Type: multipart/mixed; boundary="===============9207030134065771902==" MIME-Version: 1.0 From: =?utf-8?q?=C5=A0imon_Luka=C5=A1=C3=ADk_=3Cisimluk_at_fedoraproject=2Eorg?= =?utf-8?q?=3E?= To: spacewalk-commits at lists.fedorahosted.org Subject: client/rhel Date: Tue, 11 Dec 2012 20:43:30 +0000 Message-ID: <20121211204330.D0307129C@hosted02.fedoraproject.org> --===============9207030134065771902== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable client/rhel/spacewalk-oscap/Makefile.spacewalk-oscap | 5 = client/rhel/spacewalk-oscap/gxm.xml | 83 +++++++++++++++ client/rhel/spacewalk-oscap/spacewalk-oscap.spec | 1 = client/rhel/spacewalk-oscap/xccdf-resume.xslt | 103 --------------= ----- client/rhel/spacewalk-oscap/xccdf-resume.xslt.in | 103 ++++++++++++++= +++++ 5 files changed, 191 insertions(+), 104 deletions(-) New commits: commit 3a92473ab3cada8b278194525e02fb0d2be44975 Author: Simon Lukasik Date: Tue Dec 11 21:11:42 2012 +0100 Support for XCCDF 1.2. = XSLT 1.0 transformation cannot handle multiple namespaces easily. Let's use XSLT to build the final XSLT. diff --git a/client/rhel/spacewalk-oscap/Makefile.spacewalk-oscap b/client/= rhel/spacewalk-oscap/Makefile.spacewalk-oscap index 463cb97..5de4aaa 100644 --- a/client/rhel/spacewalk-oscap/Makefile.spacewalk-oscap +++ b/client/rhel/spacewalk-oscap/Makefile.spacewalk-oscap @@ -18,6 +18,9 @@ DIR =3D -m 755 --verbose -d = all: $(OBJECTS) = +%.xslt: %.xslt.in + xsltproc gxm.xml $< > $@ + %.pyc: %.py python -c "import py_compile; py_compile.compile('$<')" = @@ -28,4 +31,4 @@ install: all $(INSTALL) $(FILE) $(CAPABILITY) $(CAPSDIR) = clean: - @rm -rf *.pyc *~ .*~ + @rm -rf *.pyc *~ .*~ $(XSLT) diff --git a/client/rhel/spacewalk-oscap/gxm.xml b/client/rhel/spacewalk-os= cap/gxm.xml new file mode 100644 index 0000000..9fccd87 --- /dev/null +++ b/client/rhel/spacewalk-oscap/gxm.xml @@ -0,0 +1,83 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/client/rhel/spacewalk-oscap/spacewalk-oscap.spec b/client/rhel= /spacewalk-oscap/spacewalk-oscap.spec index 85cb910..2209d08 100644 --- a/client/rhel/spacewalk-oscap/spacewalk-oscap.spec +++ b/client/rhel/spacewalk-oscap/spacewalk-oscap.spec @@ -11,6 +11,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root= -%(%{__id_u} -n) BuildArch: noarch BuildRequires: python-devel BuildRequires: rhnlib +BuildRequires: libxslt Requires: openscap-utils >=3D 0.9.2 Requires: libxslt Requires: rhnlib diff --git a/client/rhel/spacewalk-oscap/xccdf-resume.xslt b/client/rhel/sp= acewalk-oscap/xccdf-resume.xslt deleted file mode 100644 index 0c458d9..0000000 --- a/client/rhel/spacewalk-oscap/xccdf-resume.xslt +++ /dev/null @@ -1,103 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/client/rhel/spacewalk-oscap/xccdf-resume.xslt.in b/client/rhel= /spacewalk-oscap/xccdf-resume.xslt.in new file mode 100644 index 0000000..30d294c --- /dev/null +++ b/client/rhel/spacewalk-oscap/xccdf-resume.xslt.in @@ -0,0 +1,103 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + --===============9207030134065771902==-- From isimluk at fedoraproject.org Thu Aug 20 12:13:41 2015 Content-Type: multipart/mixed; boundary="===============2269560800491097700==" MIME-Version: 1.0 From: =?utf-8?q?=C5=A0imon_Luka=C5=A1=C3=ADk_=3Cisimluk_at_fedoraproject=2Eorg?= =?utf-8?q?=3E?= To: spacewalk-commits at lists.fedorahosted.org Subject: client/rhel rel-eng/packages Date: Tue, 11 Dec 2012 20:44:54 +0000 Message-ID: <20121211204454.74089129C@hosted02.fedoraproject.org> --===============2269560800491097700== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable client/rhel/spacewalk-oscap/spacewalk-oscap.spec | 5 ++++- rel-eng/packages/spacewalk-oscap | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) New commits: commit 5fae4497fe070b00198748bb2c9cc59b8f482da9 Author: Simon Lukasik Date: Tue Dec 11 21:44:42 2012 +0100 Automatic commit of package [spacewalk-oscap] release [0.0.13-1]. diff --git a/client/rhel/spacewalk-oscap/spacewalk-oscap.spec b/client/rhel= /spacewalk-oscap/spacewalk-oscap.spec index 2209d08..6b03026 100644 --- a/client/rhel/spacewalk-oscap/spacewalk-oscap.spec +++ b/client/rhel/spacewalk-oscap/spacewalk-oscap.spec @@ -1,5 +1,5 @@ Name: spacewalk-oscap -Version: 0.0.12 +Version: 0.0.13 Release: 1%{?dist} Summary: OpenSCAP plug-in for rhn-check = @@ -43,6 +43,9 @@ rm -rf $RPM_BUILD_ROOT = = %changelog +* Tue Dec 11 2012 Simon Lukasik 0.0.13-1 +- Support for XCCDF 1.2. + * Tue Dec 11 2012 Simon Lukasik 0.0.12-1 - Allow --cpe command-line argument to oscap. = diff --git a/rel-eng/packages/spacewalk-oscap b/rel-eng/packages/spacewalk-= oscap index b95d4db..1f43a14 100644 --- a/rel-eng/packages/spacewalk-oscap +++ b/rel-eng/packages/spacewalk-oscap @@ -1 +1 @@ -0.0.12-1 client/rhel/spacewalk-oscap/ +0.0.13-1 client/rhel/spacewalk-oscap/ --===============2269560800491097700==-- From isimluk at fedoraproject.org Thu Aug 20 12:13:41 2015 Content-Type: multipart/mixed; boundary="===============1965554066141704864==" MIME-Version: 1.0 From: =?utf-8?q?=C5=A0imon_Luka=C5=A1=C3=ADk_=3Cisimluk_at_fedoraproject=2Eorg?= =?utf-8?q?=3E?= To: spacewalk-commits at lists.fedorahosted.org Subject: Changes to 'refs/tags/spacewalk-oscap-0.0.13-1' Date: Tue, 11 Dec 2012 20:45:04 +0000 Message-ID: <20121211204504.404E4A0C29@fedorahosted.org> --===============1965554066141704864== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Tag 'spacewalk-oscap-0.0.13-1' created by Simon Lukasik at 2012-12-11 20:44 +0000 Tagging package [spacewalk-oscap] version [0.0.13-1] in directory [client/r= hel/spacewalk-oscap/]. Changes since spacewalk-oscap-0.0.12-1: Simon Lukasik (2): Support for XCCDF 1.2. Automatic commit of package [spacewalk-oscap] release [0.0.13-1]. --- client/rhel/spacewalk-oscap/Makefile.spacewalk-oscap | 5 = client/rhel/spacewalk-oscap/gxm.xml | 83 +++++++++++++++ client/rhel/spacewalk-oscap/spacewalk-oscap.spec | 6 - client/rhel/spacewalk-oscap/xccdf-resume.xslt | 103 --------------= ----- client/rhel/spacewalk-oscap/xccdf-resume.xslt.in | 103 ++++++++++++++= +++++ rel-eng/packages/spacewalk-oscap | 2 = 6 files changed, 196 insertions(+), 106 deletions(-) --- --===============1965554066141704864==-- From tkasparek at fedoraproject.org Thu Aug 20 12:13:41 2015 Content-Type: multipart/mixed; boundary="===============7510936923953933070==" MIME-Version: 1.0 From: =?utf-8?q?Tom=C3=A1=C5=A1_Ka=C5=A1p=C3=A1rek_=3Ctkasparek_at_fedoraprojec?= =?utf-8?q?t=2Eorg=3E?= To: spacewalk-commits at lists.fedorahosted.org Subject: java/buildconf Date: Wed, 12 Dec 2012 13:10:07 +0000 Message-ID: <20121212131007.892D9A0C3A@fedorahosted.org> --===============7510936923953933070== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/buildconf/build-webapp.xml | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) New commits: commit ed0bccb751ba9999aa90e8aad4d87e9675360311 Author: Tomas Kasparek Date: Wed Dec 12 14:03:33 2012 +0100 Determining tomcat version and using it when building webapp instead ha= rdcode tomcat5 = Building webapp couldn't work with any other tomcat than tomcat5. diff --git a/java/buildconf/build-webapp.xml b/java/buildconf/build-webapp.= xml index 2bcc983..d63d726 100644 --- a/java/buildconf/build-webapp.xml +++ b/java/buildconf/build-webapp.xml @@ -1,6 +1,10 @@ = = + + + + = + = diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/sche= dule/profile-sync.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/ki= ckstart/schedule/profile-sync.jspf index 093d3d9..b6446ae 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/pr= ofile-sync.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/pr= ofile-sync.jspf @@ -44,12 +44,12 @@ /> :&= nbsp;  = - diff --git a/java/code/webapp/WEB-INF/struts-config.xml b/java/code/webapp/= WEB-INF/struts-config.xml index 0b44ba8..6793b48 100644 --- a/java/code/webapp/WEB-INF/struts-config.xml +++ b/java/code/webapp/WEB-INF/struts-config.xml @@ -841,6 +841,7 @@ + --===============0921279435134632877==-- From adelton at fedoraproject.org Thu Aug 20 12:13:42 2015 Content-Type: multipart/mixed; boundary="===============8789279321176470383==" MIME-Version: 1.0 From: Jan Pazdziora To: spacewalk-commits at lists.fedorahosted.org Subject: java/spacewalk-java.spec rel-eng/packages Date: Mon, 17 Dec 2012 10:00:39 +0000 Message-ID: <20121217100039.3FC0D40C8@hosted02.fedoraproject.org> --===============8789279321176470383== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/spacewalk-java.spec | 5 ++++- rel-eng/packages/spacewalk-java | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) New commits: commit eaf2c2d158b252e68d40e6c4c3181f1f7bdfb61d Author: Jan Pazdziora Date: Mon Dec 17 11:00:27 2012 +0100 Automatic commit of package [spacewalk-java] release [1.9.30-1]. diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index 7dbabf5..0c22e60 100644 --- a/java/spacewalk-java.spec +++ b/java/spacewalk-java.spec @@ -28,7 +28,7 @@ Name: spacewalk-java Summary: Spacewalk Java site packages Group: Applications/Internet License: GPLv2 -Version: 1.9.29 +Version: 1.9.30 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{versi= on}.tar.gz = @@ -659,6 +659,9 @@ fi %{jardir}/postgresql-jdbc.jar = %changelog +* Mon Dec 17 2012 Jan Pazdziora 1.9.30-1 +- Do not use 's with the same names on one form. Automatic commit of package [spacewalk-java] release [1.9.30-1]. --- java/code/src/com/redhat/rhn/frontend/action/kickstart/ScheduleKickstartWi= zardAction.java | 2 +- java/code/src/com/redhat/rhn/frontend/action/kickstart/ssm/SsmKSScheduleAc= tion.java | 2 +- java/code/src/com/redhat/rhn/frontend/action/kickstart/test/ScheduleKickst= artWizardTest.java | 2 +- java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/Provis= ionVirtualizationWizardAction.java | 2 +- java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/test/P= rovisionVirtualizationWizardActionTest.java | 2 +- java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/ks-wiza= rd.jspf | 1 + java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/profile= -sync.jspf | 4 ++-- java/code/webapp/WEB-INF/struts-config.xml = | 1 + java/spacewalk-java.spec = | 5 ++++- rel-eng/packages/spacewalk-java = | 2 +- 10 files changed, 14 insertions(+), 9 deletions(-) --- --===============6274698176405865134==-- From adelton at fedoraproject.org Thu Aug 20 12:13:42 2015 Content-Type: multipart/mixed; boundary="===============8040206757330683886==" MIME-Version: 1.0 From: Jan Pazdziora To: spacewalk-commits at lists.fedorahosted.org Subject: client/tools rel-eng/packages Date: Mon, 17 Dec 2012 10:01:13 +0000 Message-ID: <20121217100113.E8066A0DE3@fedorahosted.org> --===============8040206757330683886== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable client/tools/spacewalk-koan/spacewalk-koan.spec | 8 +++++++- rel-eng/packages/spacewalk-koan | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) New commits: commit 3edaefb6c2c39d34cf3be55150cb753314497a48 Author: Jan Pazdziora Date: Mon Dec 17 11:01:02 2012 +0100 Automatic commit of package [spacewalk-koan] release [1.9.1-1]. diff --git a/client/tools/spacewalk-koan/spacewalk-koan.spec b/client/tools= /spacewalk-koan/spacewalk-koan.spec index c7cc97e..b56eadd 100644 --- a/client/tools/spacewalk-koan/spacewalk-koan.spec +++ b/client/tools/spacewalk-koan/spacewalk-koan.spec @@ -3,7 +3,7 @@ Name: spacewalk-koan Group: System Environment/Kernel License: GPLv2 Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version= }.tar.gz -Version: 1.9.0 +Version: 1.9.1 Release: 1%{?dist} BuildArch : noarch URL: https://fedorahosted.org/spacewalk @@ -46,6 +46,12 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/rhn/actions/ = %changelog +* Mon Dec 17 2012 Jan Pazdziora 1.9.1-1 +- properly specify device for 'ip route' command +- typo fix +- use ip instead of route to determine default gateway +- use ip instead of ifconfig to get networking info + * Tue Oct 30 2012 Jan Pazdziora 1.8.3-1 - Update the copyright year. = diff --git a/rel-eng/packages/spacewalk-koan b/rel-eng/packages/spacewalk-k= oan index f6e3eca..8d2380b 100644 --- a/rel-eng/packages/spacewalk-koan +++ b/rel-eng/packages/spacewalk-koan @@ -1 +1 @@ -1.8.3-1 client/tools/spacewalk-koan/ +1.9.1-1 client/tools/spacewalk-koan/ --===============8040206757330683886==-- From adelton at fedoraproject.org Thu Aug 20 12:13:42 2015 Content-Type: multipart/mixed; boundary="===============2060065493291060209==" MIME-Version: 1.0 From: Jan Pazdziora To: spacewalk-commits at lists.fedorahosted.org Subject: Changes to 'refs/tags/spacewalk-koan-1.9.1-1' Date: Mon, 17 Dec 2012 10:01:25 +0000 Message-ID: <20121217100125.74541A0DE3@fedorahosted.org> --===============2060065493291060209== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Tag 'spacewalk-koan-1.9.1-1' created by Jan Pazdziora at 2012-12-17 10:01 +0000 Tagging package [spacewalk-koan] version [1.9.1-1] in directory [client/too= ls/spacewalk-koan/]. Changes since spacewalk-java-1.9.30-1: Jan Pazdziora (1): Automatic commit of package [spacewalk-koan] release [1.9.1-1]. --- client/tools/spacewalk-koan/spacewalk-koan.spec | 8 +++++++- rel-eng/packages/spacewalk-koan | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) --- --===============2060065493291060209==-- From mmraka at fedoraproject.org Thu Aug 20 12:13:42 2015 Content-Type: multipart/mixed; boundary="===============5354265286186457753==" MIME-Version: 1.0 From: Michael Mraka To: spacewalk-commits at lists.fedorahosted.org Subject: 2 commits - proxy/proxy rel-eng/packages Date: Mon, 17 Dec 2012 10:17:19 +0000 Message-ID: <20121217101719.D27B71C7F@hosted02.fedoraproject.org> --===============5354265286186457753== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable proxy/proxy/pm/rhn_package_manager.py | 22 +++++++++++----------- proxy/proxy/spacewalk-proxy.spec | 5 ++++- rel-eng/packages/spacewalk-proxy | 2 +- 3 files changed, 16 insertions(+), 13 deletions(-) New commits: commit e06ea938a46f337fcbea51524dcbcb455cf19aaa Author: Michael Mraka Date: Mon Dec 17 11:16:53 2012 +0100 Automatic commit of package [spacewalk-proxy] release [1.9.3-1]. diff --git a/proxy/proxy/spacewalk-proxy.spec b/proxy/proxy/spacewalk-proxy= .spec index 6e4d4ff..43d39e1 100644 --- a/proxy/proxy/spacewalk-proxy.spec +++ b/proxy/proxy/spacewalk-proxy.spec @@ -4,7 +4,7 @@ Group: Applications/Internet License: GPLv2 URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version= }.tar.gz -Version: 1.9.2 +Version: 1.9.3 Release: 1%{?dist} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) = BuildRequires: python @@ -330,6 +330,9 @@ fi = = %changelog +* Mon Dec 17 2012 Michael Mraka 1.9.3-1 +- fixed indentation + * Fri Dec 14 2012 Michael Mraka 1.9.2-1 - 873541 - switch back to /XP handler if /APP is not available = diff --git a/rel-eng/packages/spacewalk-proxy b/rel-eng/packages/spacewalk-= proxy index 099e876..991af35 100644 --- a/rel-eng/packages/spacewalk-proxy +++ b/rel-eng/packages/spacewalk-proxy @@ -1 +1 @@ -1.9.2-1 proxy/proxy/ +1.9.3-1 proxy/proxy/ commit 1a5ee03faf1bb43630e102fd7c2456ce859fdbe6 Author: Michael Mraka Date: Mon Dec 17 11:13:10 2012 +0100 fixed indentation diff --git a/proxy/proxy/pm/rhn_package_manager.py b/proxy/proxy/pm/rhn_pac= kage_manager.py index 12e8f8a..60db8f6 100755 --- a/proxy/proxy/pm/rhn_package_manager.py +++ b/proxy/proxy/pm/rhn_package_manager.py @@ -141,17 +141,17 @@ class UploadClass(uploadLib.UploadClass): self.url =3D parseUrl(self.url)[1].split(':')[0] self.url =3D scheme + self.url + path = - def setServer(self): - try: - uploadLib.UploadClass.setServer(self) - uploadLib.call(self.server.packages.no_op, raise_protocol_error= =3DTrue) - except xmlrpclib.ProtocolError, e: - if e.errcode =3D=3D 404: - self.use_session =3D False - self.setURL('/XP') - uploadLib.UploadClass.setServer(self) - else: - raise + def setServer(self): + try: + uploadLib.UploadClass.setServer(self) + uploadLib.call(self.server.packages.no_op, raise_protocol_error= =3DTrue) + except xmlrpclib.ProtocolError, e: + if e.errcode =3D=3D 404: + self.use_session =3D False + self.setURL('/XP') + uploadLib.UploadClass.setServer(self) + else: + raise = def authenticate(self): if self.use_session: --===============5354265286186457753==-- From mmraka at fedoraproject.org Thu Aug 20 12:13:42 2015 Content-Type: multipart/mixed; boundary="===============4067412012895853931==" MIME-Version: 1.0 From: Michael Mraka To: spacewalk-commits at lists.fedorahosted.org Subject: Changes to 'refs/tags/spacewalk-proxy-1.9.3-1' Date: Mon, 17 Dec 2012 10:17:34 +0000 Message-ID: <20121217101735.0FBEAA32DE@fedorahosted.org> --===============4067412012895853931== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Tag 'spacewalk-proxy-1.9.3-1' created by Michael Mraka at 2012-12-17 10:16 +0000 Tagging package [spacewalk-proxy] version [1.9.3-1] in directory [proxy/pro= xy/]. Changes since spacewalk-koan-1.9.1-1: Michael Mraka (2): fixed indentation Automatic commit of package [spacewalk-proxy] release [1.9.3-1]. --- proxy/proxy/pm/rhn_package_manager.py | 22 +++++++++++----------- proxy/proxy/spacewalk-proxy.spec | 5 ++++- rel-eng/packages/spacewalk-proxy | 2 +- 3 files changed, 16 insertions(+), 13 deletions(-) --- --===============4067412012895853931==-- From mmraka at fedoraproject.org Thu Aug 20 12:13:42 2015 Content-Type: multipart/mixed; boundary="===============4759860777088666084==" MIME-Version: 1.0 From: Michael Mraka To: spacewalk-commits at lists.fedorahosted.org Subject: 3 commits - client/tools rel-eng/packages Date: Mon, 17 Dec 2012 10:27:21 +0000 Message-ID: <20121217102721.1DA7C212C@hosted02.fedoraproject.org> --===============4759860777088666084== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable client/tools/rhnpush/rhnpush.spec | 6 +++++- client/tools/rhnpush/uploadLib.py | 13 +++++++++++-- rel-eng/packages/rhnpush | 2 +- 3 files changed, 17 insertions(+), 4 deletions(-) New commits: commit cae8333594c5ec977275ec5d66a4cf2e65e78d6c Author: Michael Mraka Date: Mon Dec 17 11:27:08 2012 +0100 Automatic commit of package [rhnpush] release [5.5.58-1]. diff --git a/client/tools/rhnpush/rhnpush.spec b/client/tools/rhnpush/rhnpu= sh.spec index 5b2f2fe..99bb8c5 100644 --- a/client/tools/rhnpush/rhnpush.spec +++ b/client/tools/rhnpush/rhnpush.spec @@ -4,7 +4,7 @@ Name: rhnpush Group: Applications/System License: GPLv2 URL: http://fedorahosted.org/spacewalk -Version: 5.5.57 +Version: 5.5.58 Release: 1%{?dist} Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{v= ersion}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} = -n) @@ -75,6 +75,10 @@ spacewalk-pylint $RPM_BUILD_ROOT%{rhnroot} %doc COPYING = %changelog +* Mon Dec 17 2012 Michael Mraka 5.5.58-1 +- restored old passwd based API functions +- fixed Bad indentation. Found 11 spaces, expected 12 + * Fri Dec 14 2012 Michael Mraka 5.5.57-1 - 873541 - switch back to /XP handler if /APP is not available = diff --git a/rel-eng/packages/rhnpush b/rel-eng/packages/rhnpush index 061e7af..90570d1 100644 --- a/rel-eng/packages/rhnpush +++ b/rel-eng/packages/rhnpush @@ -1 +1 @@ -5.5.57-1 client/tools/rhnpush/ +5.5.58-1 client/tools/rhnpush/ commit 6b12779d2e59c8bbe7ed2ab7cac93621e6b83d5a Author: Michael Mraka Date: Mon Dec 17 11:24:42 2012 +0100 restored old passwd based API functions = Fixing E0602:183:UploadClass._listChannelSource: Undefined variable 'listChann= elSource' E0602:193:UploadClass._listChannel: Undefined variable 'listChannel' E0602:318:UploadClass._listMissingSourcePackages: Undefined variable 'l= istMissingSourcePackages' = partial revert of 0f10d4045e87f568a36dc46ed23fc11e7d183dba diff --git a/client/tools/rhnpush/uploadLib.py b/client/tools/rhnpush/uploa= dLib.py index 611d5b3..54f64ca 100644 --- a/client/tools/rhnpush/uploadLib.py +++ b/client/tools/rhnpush/uploadLib.py @@ -645,12 +645,21 @@ def parseXMLRPCfault(fault): return ServerFault(faultCode, "", fault.faultString) = # pylint: disable=3DC0103 +def listChannel(server, username, password, channels): + return call(server.packages.listChannel, channels, username, password) + def listChannelBySession(server, session_string, channels): = return call(server.packages.listChannelBySession, channels, session_st= ring) = +def listChannelSource(server, username, password, channels): + return call(server.packages.listChannelSource, channels, username, pas= sword) + def listChannelSourceBySession(server, session_string, channels): return call(server.packages.listChannelSourceBySession, channels, sess= ion_string) = +def listMissingSourcePackages(server, username, password, channels): + return call(server.packages.listMissingSourcePackages, channels, usern= ame, password) + def listMissingSourcePackagesBySession(server, session_string, channels): return call(server.packages.listMissingSourcePackagesBySession, channe= ls, session_string) = commit e895462e199f8f521ef723aff93fb8b4335da5c4 Author: Michael Mraka Date: Mon Dec 17 11:22:26 2012 +0100 fixed Bad indentation. Found 11 spaces, expected 12 diff --git a/client/tools/rhnpush/uploadLib.py b/client/tools/rhnpush/uploa= dLib.py index affc8c9..611d5b3 100644 --- a/client/tools/rhnpush/uploadLib.py +++ b/client/tools/rhnpush/uploadLib.py @@ -312,10 +312,10 @@ class UploadClass: = def _listMissingSourcePackages(self): if self.use_session: - return listMissingSourcePackagesBySession(self.server, + return listMissingSourcePackagesBySession(self.server, self.session.getSessionString(), self.chan= nels) else: - return listMissingSourcePackages(self.server, + return listMissingSourcePackages(self.server, self.username, self.password, self.channel= s) = def get_missing_source_packages(self): --===============4759860777088666084==-- From mmraka at fedoraproject.org Thu Aug 20 12:13:42 2015 Content-Type: multipart/mixed; boundary="===============1277016833789829163==" MIME-Version: 1.0 From: Michael Mraka To: spacewalk-commits at lists.fedorahosted.org Subject: Changes to 'refs/tags/rhnpush-5.5.58-1' Date: Mon, 17 Dec 2012 10:27:30 +0000 Message-ID: <20121217102730.D6A00A0DE3@fedorahosted.org> --===============1277016833789829163== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Tag 'rhnpush-5.5.58-1' created by Michael Mraka at 2012-12-17 10:27 +0000 Tagging package [rhnpush] version [5.5.58-1] in directory [client/tools/rhn= push/]. Changes since spacewalk-proxy-1.9.3-1: Michael Mraka (3): fixed Bad indentation. Found 11 spaces, expected 12 restored old passwd based API functions Automatic commit of package [rhnpush] release [5.5.58-1]. --- client/tools/rhnpush/rhnpush.spec | 6 +++++- client/tools/rhnpush/uploadLib.py | 13 +++++++++++-- rel-eng/packages/rhnpush | 2 +- 3 files changed, 17 insertions(+), 4 deletions(-) --- --===============1277016833789829163==-- From tlestach at fedoraproject.org Thu Aug 20 12:13:42 2015 Content-Type: multipart/mixed; boundary="===============4885915602375001658==" MIME-Version: 1.0 From: Tomas Lestach To: spacewalk-commits at lists.fedorahosted.org Subject: java/code Date: Mon, 17 Dec 2012 12:50:48 +0000 Message-ID: <20121217125048.CDA15A0DE3@fedorahosted.org> --===============4885915602375001658== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/domain/rhnpackage/PackageProperty.java | 47= ---------- 1 file changed, 47 deletions(-) New commits: commit 653949cab065673827c817a2137888b6ecccf37c Author: Tomas Lestach Date: Mon Dec 17 13:50:17 2012 +0100 remove strange unused code diff --git a/java/code/src/com/redhat/rhn/domain/rhnpackage/PackageProperty= .java b/java/code/src/com/redhat/rhn/domain/rhnpackage/PackageProperty.java index 2102ef3..4bfe75b 100644 --- a/java/code/src/com/redhat/rhn/domain/rhnpackage/PackageProperty.java +++ b/java/code/src/com/redhat/rhn/domain/rhnpackage/PackageProperty.java @@ -72,53 +72,6 @@ public class PackageProperty extends BaseDomainHelper { } = /** - * @return a human readable representation of the sense - */ - public String getSenseAsString() { - Long senseIn =3D this.sense & 0xf; - if (senseIn =3D=3D 2) { - return "LT"; - } - else if (senseIn =3D=3D 4) { - return "GT"; - } - else if (senseIn =3D=3D 8) { - return "EQ"; - } - else if (senseIn =3D=3D 10) { - return "LE"; - } - else { // 12 - return "GE"; - } - } - - /** - * @param senseIn The sense to set. - */ - public void setSenseFromString(String senseIn) { - Long senseVal; - - if (senseIn =3D=3D "LT") { - senseVal =3D 2L; - } - else if (senseIn =3D=3D "GT") { - senseVal =3D 4L; - } - else if (senseIn =3D=3D "EQ") { - senseVal =3D 8L; - } - else if (senseIn =3D=3D "LE") { - senseVal =3D 10L; - } - else { // "GE" - senseVal =3D 12L; - } - - this.sense =3D senseVal & 0xf; - } - - /** * * {@inheritDoc} */ --===============4885915602375001658==-- From mmraka at fedoraproject.org Thu Aug 20 12:13:42 2015 Content-Type: multipart/mixed; boundary="===============2174020520415151834==" MIME-Version: 1.0 From: Michael Mraka To: spacewalk-commits at lists.fedorahosted.org Subject: 2 commits - proxy/proxy rel-eng/packages Date: Mon, 17 Dec 2012 15:49:00 +0000 Message-ID: <20121217154900.3652CA0DE3@fedorahosted.org> --===============2174020520415151834== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable proxy/proxy/pm/rhn_package_manager.py | 6 +++--- proxy/proxy/spacewalk-proxy.spec | 5 ++++- rel-eng/packages/spacewalk-proxy | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) New commits: commit d03cd59466b820be596bc16683f9e2edf7bb7e5b Author: Michael Mraka Date: Mon Dec 17 16:48:45 2012 +0100 Automatic commit of package [spacewalk-proxy] release [1.9.4-1]. diff --git a/proxy/proxy/spacewalk-proxy.spec b/proxy/proxy/spacewalk-proxy= .spec index 43d39e1..ea15276 100644 --- a/proxy/proxy/spacewalk-proxy.spec +++ b/proxy/proxy/spacewalk-proxy.spec @@ -4,7 +4,7 @@ Group: Applications/Internet License: GPLv2 URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version= }.tar.gz -Version: 1.9.3 +Version: 1.9.4 Release: 1%{?dist} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) = BuildRequires: python @@ -330,6 +330,9 @@ fi = = %changelog +* Mon Dec 17 2012 Michael Mraka 1.9.4-1 +- fixed pylint warnings + * Mon Dec 17 2012 Michael Mraka 1.9.3-1 - fixed indentation = diff --git a/rel-eng/packages/spacewalk-proxy b/rel-eng/packages/spacewalk-= proxy index 991af35..d5ec0b2 100644 --- a/rel-eng/packages/spacewalk-proxy +++ b/rel-eng/packages/spacewalk-proxy @@ -1 +1 @@ -1.9.3-1 proxy/proxy/ +1.9.4-1 proxy/proxy/ commit 146800c0e66e0414cffc5706ee633c0ff2259253 Author: Michael Mraka Date: Mon Dec 17 14:35:11 2012 +0100 fixed pylint warnings = Bad indentation. Found 11 spaces, expected 12 UploadClass.setURL: Arguments number differs from overridden method diff --git a/proxy/proxy/pm/rhn_package_manager.py b/proxy/proxy/pm/rhn_pac= kage_manager.py index 60db8f6..6dfb770 100755 --- a/proxy/proxy/pm/rhn_package_manager.py +++ b/proxy/proxy/pm/rhn_package_manager.py @@ -127,7 +127,7 @@ def main(): = = class UploadClass(uploadLib.UploadClass): - # pylint: disable=3DR0904 + # pylint: disable=3DR0904,W0221 def setURL(self, path =3D '/APP'): # overloaded for uploadlib.py if not CFG.RHN_PARENT: @@ -143,8 +143,8 @@ class UploadClass(uploadLib.UploadClass): = def setServer(self): try: - uploadLib.UploadClass.setServer(self) - uploadLib.call(self.server.packages.no_op, raise_protocol_error= =3DTrue) + uploadLib.UploadClass.setServer(self) + uploadLib.call(self.server.packages.no_op, raise_protocol_erro= r=3DTrue) except xmlrpclib.ProtocolError, e: if e.errcode =3D=3D 404: self.use_session =3D False --===============2174020520415151834==-- From mmraka at fedoraproject.org Thu Aug 20 12:13:42 2015 Content-Type: multipart/mixed; boundary="===============5494714722916363691==" MIME-Version: 1.0 From: Michael Mraka To: spacewalk-commits at lists.fedorahosted.org Subject: Changes to 'refs/tags/spacewalk-proxy-1.9.4-1' Date: Mon, 17 Dec 2012 15:49:10 +0000 Message-ID: <20121217154910.933F9A0DE3@fedorahosted.org> --===============5494714722916363691== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Tag 'spacewalk-proxy-1.9.4-1' created by Michael Mraka at 2012-12-17 15:48 +0000 Tagging package [spacewalk-proxy] version [1.9.4-1] in directory [proxy/pro= xy/]. Changes since rhnpush-5.5.58-1: Michael Mraka (2): fixed pylint warnings Automatic commit of package [spacewalk-proxy] release [1.9.4-1]. Tomas Lestach (1): remove strange unused code --- java/code/src/com/redhat/rhn/domain/rhnpackage/PackageProperty.java | 47= ---------- proxy/proxy/pm/rhn_package_manager.py | 6= - proxy/proxy/spacewalk-proxy.spec | 5= - rel-eng/packages/spacewalk-proxy | 2 = 4 files changed, 8 insertions(+), 52 deletions(-) --- --===============5494714722916363691==-- From tlestach at fedoraproject.org Thu Aug 20 12:13:43 2015 Content-Type: multipart/mixed; boundary="===============8490820026209500354==" MIME-Version: 1.0 From: Tomas Lestach To: spacewalk-commits at lists.fedorahosted.org Subject: java/spacewalk-java.spec rel-eng/packages Date: Tue, 18 Dec 2012 18:37:52 +0000 Message-ID: <20121218183752.7622CA0C4F@fedorahosted.org> --===============8490820026209500354== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/spacewalk-java.spec | 5 ++++- rel-eng/packages/spacewalk-java | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) New commits: commit 2e869ba54024f92a2ecca84137ad247b021907eb Author: Tomas Lestach Date: Tue Dec 18 19:37:39 2012 +0100 Automatic commit of package [spacewalk-java] release [1.9.31-1]. diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index 0c22e60..856f04c 100644 --- a/java/spacewalk-java.spec +++ b/java/spacewalk-java.spec @@ -28,7 +28,7 @@ Name: spacewalk-java Summary: Spacewalk Java site packages Group: Applications/Internet License: GPLv2 -Version: 1.9.30 +Version: 1.9.31 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{versi= on}.tar.gz = @@ -659,6 +659,9 @@ fi %{jardir}/postgresql-jdbc.jar = %changelog +* Tue Dec 18 2012 Tomas Lestach 1.9.31-1 +- remove strange unused code + * Mon Dec 17 2012 Jan Pazdziora 1.9.30-1 - Do not use