backend/satellite_tools
by Justin Sherrill
backend/satellite_tools/satsync.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 5abba755caee0f14563bbdc99642174c0ec1f6dc
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Mon Aug 30 15:48:11 2010 -0400
fixing broken string substitiution (wrong number of arguments)
diff --git a/backend/satellite_tools/satsync.py b/backend/satellite_tools/satsync.py
index b040b23..11a640e 100644
--- a/backend/satellite_tools/satsync.py
+++ b/backend/satellite_tools/satsync.py
@@ -809,14 +809,14 @@ Please contact your RHN representative""") % (generation, sat_cert.generation))
log(1, t_format % _('end-of-service'))
status = _('e')
for chn in ch_end_of_service:
- log(1, p_format % (status, chn, ''))
+ log(1, p_format % (status, chn, '', ''))
log(2, '')
if doTyposYN and ch_typos:
log(1, _(' typos:'))
status = _('?')
for chn in ch_typos:
- log(1, p_format % (status, chn, ''))
+ log(1, p_format % (status, chn, '', ''))
log(2, '')
log(1, '')
13 years, 7 months
Changes to 'refs/tags/spacewalk-backend-1.2.9-1'
by Justin Sherrill
Tag 'spacewalk-backend-1.2.9-1' created by Justin Sherrill <jsherril(a)redhat.com> at 2010-08-30 16:43 +0000
Tagging package [spacewalk-backend] version [1.2.9-1] in directory [backend/].
Changes since rhn-client-tools-1.2.4-1:
Justin Sherrill (3):
adding missing commit to make repo generation after reposync work again
626749 - fixing spacewalk-repo-sync to ignore source packages
Automatic commit of package [spacewalk-backend] release [1.2.9-1].
Tomas Lestach (5):
do not log if queue is empty for queue tasks
better create a separate method than override an existing in this case
627149 - do not return installtime via xmlrpc when not defined
checkstyle fix
591291 - list errata packages only associated to the given channel
---
backend/satellite_tools/repo_plugins/yum_src.py | 2 +
backend/satellite_tools/reposync.py | 1
backend/spacewalk-backend.spec | 11 +++++++++-
java/code/src/com/redhat/rhn/common/db/datasource/DataResult.java | 10 ++++-----
java/code/src/com/redhat/rhn/common/db/datasource/SelectMode.java | 2 -
java/code/src/com/redhat/rhn/common/db/datasource/xml/Errata_queries.xml | 11 ++++++----
java/code/src/com/redhat/rhn/domain/errata/ErrataFactory.java | 11 +++++++---
java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java | 9 ++++----
java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java | 2 -
java/code/src/com/redhat/rhn/manager/system/SystemManager.java | 3 ++
java/code/src/com/redhat/rhn/taskomatic/task/threaded/TaskQueue.java | 4 ++-
rel-eng/packages/spacewalk-backend | 2 -
schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/050-rhnServerPackage_data.sql | 2 -
13 files changed, 47 insertions(+), 23 deletions(-)
---
13 years, 7 months
backend/spacewalk-backend.spec rel-eng/packages
by Justin Sherrill
backend/spacewalk-backend.spec | 11 ++++++++++-
rel-eng/packages/spacewalk-backend | 2 +-
2 files changed, 11 insertions(+), 2 deletions(-)
New commits:
commit e2f31f36e06e278ea282ff8594d94d576a51d6ff
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Mon Aug 30 12:43:55 2010 -0400
Automatic commit of package [spacewalk-backend] release [1.2.9-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 2445653..1ac7db6 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -10,7 +10,7 @@ Name: spacewalk-backend
Summary: Common programs needed to be installed on the Spacewalk servers/proxies
Group: Applications/Internet
License: GPLv2 and Python
-Version: 1.2.8
+Version: 1.2.9
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -686,6 +686,15 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Mon Aug 30 2010 Justin Sherrill <jsherril(a)redhat.com> 1.2.9-1
+- 626749 - fixing spacewalk-repo-sync to ignore source packages
+ (jsherril(a)redhat.com)
+- adding missing commit to make repo generation after reposync work again
+ (jsherril(a)redhat.com)
+- 579588 - adding a more stern warning message to activating a ceertificate of
+ a different version (jsherril(a)redhat.com)
+- 593896 - Moved Kickstart Parition UI logic (paji(a)redhat.com)
+
* Tue Aug 24 2010 Michael Mraka <michael.mraka(a)redhat.com> 1.2.8-1
- fixed update_errata_cache_by_channel job for channels in NULL org
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index f012b1f..36d1870 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.2.8-1 backend/
+1.2.9-1 backend/
13 years, 7 months
backend/satellite_tools
by Justin Sherrill
backend/satellite_tools/repo_plugins/yum_src.py | 2 ++
1 file changed, 2 insertions(+)
New commits:
commit 55cde6f2c2407e41f39c0052d2b72919accc9e64
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Mon Aug 30 12:41:49 2010 -0400
626749 - fixing spacewalk-repo-sync to ignore source packages
diff --git a/backend/satellite_tools/repo_plugins/yum_src.py b/backend/satellite_tools/repo_plugins/yum_src.py
index 97dab39..9fc8021 100644
--- a/backend/satellite_tools/repo_plugins/yum_src.py
+++ b/backend/satellite_tools/repo_plugins/yum_src.py
@@ -58,6 +58,8 @@ class ContentSource:
list = sack.returnPackages()
to_return = []
for pack in list:
+ if pack.arch == 'src':
+ continue
new_pack = ContentPackage()
new_pack.setNVREA(pack.name, pack.version, pack.release,
pack.epoch, pack.arch)
13 years, 7 months
Branch 'SPACEWALK-1.1' - rel-eng/tito.props
by Justin Sherrill
rel-eng/tito.props | 3 ---
1 file changed, 3 deletions(-)
New commits:
commit 0ec98bb71c613b3092c9654e9760e959e9009d3b
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Mon Aug 30 12:06:56 2010 -0400
removing brew from spacewalk 1.1 branch
diff --git a/rel-eng/tito.props b/rel-eng/tito.props
index 4640da3..decbb1f 100644
--- a/rel-eng/tito.props
+++ b/rel-eng/tito.props
@@ -19,6 +19,3 @@ blacklist=jabberd-selinux
[satellite-5.4-rhel-5-candidate]
blacklist = python-hwdata spacewalk-proxy-html spacecmd spacewalk spacewalk-repo
-[cvs]
-cvsroot = :gserver:cvs.devel.redhat.com:/cvs/dist
-branches = SATELLITE-5_4-RHEL-5
13 years, 7 months
Changes to 'refs/tags/spacewalk-backend-1.1.51-1'
by Justin Sherrill
Tag 'spacewalk-backend-1.1.51-1' created by Justin Sherrill <jsherril(a)redhat.com> at 2010-08-30 16:04 +0000
Tagging package [spacewalk-backend] version [1.1.51-1] in directory [backend/].
Changes since spacewalk-java-1.1.51-1:
Justin Sherrill (2):
adding missing commit to make repo generation after reposync work again
Automatic commit of package [spacewalk-backend] release [1.1.51-1].
---
backend/satellite_tools/reposync.py | 1 +
backend/spacewalk-backend.spec | 6 +++++-
rel-eng/packages/spacewalk-backend | 2 +-
3 files changed, 7 insertions(+), 2 deletions(-)
---
13 years, 7 months
Branch 'SPACEWALK-1.1' - backend/spacewalk-backend.spec rel-eng/packages
by Justin Sherrill
backend/spacewalk-backend.spec | 6 +++++-
rel-eng/packages/spacewalk-backend | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 0a20bcc9ebfbe7d775fe55079e22c3f47b96e010
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Mon Aug 30 12:04:51 2010 -0400
Automatic commit of package [spacewalk-backend] release [1.1.51-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 402e600..40d3c9f 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -8,7 +8,7 @@ Name: spacewalk-backend
Summary: Common programs needed to be installed on the Spacewalk servers/proxies
Group: Applications/Internet
License: GPLv2 and Python
-Version: 1.1.50
+Version: 1.1.51
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -682,6 +682,10 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Mon Aug 30 2010 Justin Sherrill <jsherril(a)redhat.com> 1.1.51-1
+- adding missing commit to make repo generation after reposync work again
+ (jsherril(a)redhat.com)
+
* Thu Aug 19 2010 Milan Zazrivec <mzazrivec(a)redhat.com> 1.1.50-1
- 624732 - restore config files management functionality
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index 9606a50..f2a2f33 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.1.50-1 backend/
+1.1.51-1 backend/
13 years, 7 months
Branch 'SPACEWALK-1.1' - backend/satellite_tools
by Justin Sherrill
backend/satellite_tools/reposync.py | 1 +
1 file changed, 1 insertion(+)
New commits:
commit 9ca20f40ea674a3a402652c7feaab75848251639
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Mon Aug 30 12:03:01 2010 -0400
adding missing commit to make repo generation after reposync work again
diff --git a/backend/satellite_tools/reposync.py b/backend/satellite_tools/reposync.py
index 7dd09ad..0b04687 100644
--- a/backend/satellite_tools/reposync.py
+++ b/backend/satellite_tools/reposync.py
@@ -108,6 +108,7 @@ class RepoSync:
if self.regen:
taskomatic.add_to_repodata_queue_for_channel_package_subscription(
[self.channel_label], [], "server.app.yumreposync")
+ rhnSQL.commit()
self.print_msg("Sync complete")
def process_args(self):
13 years, 7 months
backend/satellite_tools
by Justin Sherrill
backend/satellite_tools/reposync.py | 1 +
1 file changed, 1 insertion(+)
New commits:
commit fdf7f5aa1b4cc7e5ef1ef06f6df87266e18c2e43
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Mon Aug 30 12:03:01 2010 -0400
adding missing commit to make repo generation after reposync work again
diff --git a/backend/satellite_tools/reposync.py b/backend/satellite_tools/reposync.py
index 7dd09ad..0b04687 100644
--- a/backend/satellite_tools/reposync.py
+++ b/backend/satellite_tools/reposync.py
@@ -108,6 +108,7 @@ class RepoSync:
if self.regen:
taskomatic.add_to_repodata_queue_for_channel_package_subscription(
[self.channel_label], [], "server.app.yumreposync")
+ rhnSQL.commit()
self.print_msg("Sync complete")
def process_args(self):
13 years, 7 months
java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/common/db/datasource/xml/Errata_queries.xml | 11 ++++++----
java/code/src/com/redhat/rhn/domain/errata/ErrataFactory.java | 11 +++++++---
java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java | 9 ++++----
3 files changed, 20 insertions(+), 11 deletions(-)
New commits:
commit 4fd253ce58469dd8d48170fe284e635e68827e9f
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Aug 27 22:47:30 2010 +0200
591291 - list errata packages only associated to the given channel
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Errata_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Errata_queries.xml
index d19545b..6cf523f 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Errata_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Errata_queries.xml
@@ -1144,10 +1144,13 @@ ORDER BY C.name, EF.filename DESC
<mode name="packageids_associated_to_errata"
class="com.redhat.rhn.frontend.dto.ErrataPackageFile">
- <query params="">
- SELECT package_id
- FROM rhnErrataPackage
- WHERE errata_id in (%s)
+ <query params="channel_id">
+ SELECT ep.package_id
+ FROM rhnErrataPackage ep,
+ rhnChannelPackage cp
+ WHERE ep.package_id = cp.package_id
+ AND cp.channel_id = :channel_id
+ AND ep.errata_id in (%s)
</query>
</mode>
diff --git a/java/code/src/com/redhat/rhn/domain/errata/ErrataFactory.java b/java/code/src/com/redhat/rhn/domain/errata/ErrataFactory.java
index 482f900..08bd8fc 100644
--- a/java/code/src/com/redhat/rhn/domain/errata/ErrataFactory.java
+++ b/java/code/src/com/redhat/rhn/domain/errata/ErrataFactory.java
@@ -113,14 +113,19 @@ public class ErrataFactory extends HibernateFactory {
/**
* List the package ids that are associated with an errata
+ * associated with given channel
+ * @param channelId channel of interest
* @param errataIds list of errata ids
* @return List of package ids
*/
- public static List<Long> listErrataChannelPackages(Set<Long> errataIds) {
+ public static List<Long> listErrataChannelPackages(Long channelId,
+ Set<Long> errataIds) {
SelectMode m = ModeFactory.getMode("Errata_queries",
"packageids_associated_to_errata");
- DataResult<ErrataPackageFile> dr = m.execute(new HashMap(),
- new ArrayList(errataIds));
+ Map params = new HashMap();
+ params.put("channel_id", channelId);
+ DataResult<ErrataPackageFile> dr = m.execute(params, new ArrayList(errataIds));
+ // make the final list unique
Set toReturn = new HashSet<Long>();
for (ErrataPackageFile file : dr) {
toReturn.add(file.getPackageId());
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java
index e310af8..6b5cd8c 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java
@@ -1780,7 +1780,7 @@ public class ChannelSoftwareHandler extends BaseHandler {
diffErrata.removeAll(clones);
Set<Errata> mergedErrata =
- mergeErrataToChannel(loggedInUser, diffErrata, mergeTo);
+ mergeErrataToChannel(loggedInUser, diffErrata, mergeTo, mergeFrom);
return mergedErrata.toArray();
}
@@ -1838,13 +1838,13 @@ public class ChannelSoftwareHandler extends BaseHandler {
diffErrata.removeAll(clones);
Set<Errata> mergedErrata =
- mergeErrataToChannel(loggedInUser, diffErrata, mergeTo);
+ mergeErrataToChannel(loggedInUser, diffErrata, mergeTo, mergeFrom);
return mergedErrata.toArray();
}
private Set<Errata> mergeErrataToChannel(User user, Set<Errata> diffErrata,
- Channel toChannel) {
+ Channel toChannel, Channel fromChannel) {
List<Long> cids = new ArrayList<Long>();
cids.add(toChannel.getId());
@@ -1852,7 +1852,8 @@ public class ChannelSoftwareHandler extends BaseHandler {
ErrataManager.publishErrataToChannelAsync(toChannel, errataIds, user);
- List errataPkgs = ErrataFactory.listErrataChannelPackages(errataIds);
+ List errataPkgs = ErrataFactory.listErrataChannelPackages(fromChannel.getId(),
+ errataIds);
List currentChannelPkgs = ChannelFactory.getPackageIds(toChannel.getId());
errataPkgs.removeAll(currentChannelPkgs);
13 years, 7 months