Changes to 'refs/tags/spacewalk-java-1.5.13-1'
by Šimon Lukašík
Tag 'spacewalk-java-1.5.13-1' created by Simon Lukasik <slukasik(a)redhat.com> at 2011-04-30 19:55 +0000
Tagging package [spacewalk-java] version [1.5.13-1] in directory [java/].
Changes since spacewalk-backend-1.5.12-1:
Jan Pazdziora (6):
Removal of ReleaseChannelMapImport makes processReleaseChannelMap unused, removing.
Method reload_packages not used in our code, removing.
The can_delete_custominfokey no longer used after previous removals, removing.
Removal of remove_system_value makes remove_custom_value unused, dropping.
Removal of system_value_edit makes set_custom_value unused, dropping.
The close of IO::AtomicFile can also die, we should catch it right there.
Miroslav Suchý (1):
bump up epoch, and match version of osad with spacewalk version
Simon Lukasik (2):
Remove the static comps file mapping for RHEL 5.0 trees
Automatic commit of package [spacewalk-java] release [1.5.13-1].
Ville Salmela (1):
Patch to run remote commands on multiple machines on Spacewalk 1.4 PostgreSQL.
---
backend/server/importlib/backend.py | 24 ----
backend/server/rhnServer/server_wrapper.py | 5
client/tools/osad/osad.spec | 3
java/code/src/com/redhat/rhn/taskomatic/task/repomd/DebRepositoryWriter.java | 12 --
java/code/src/com/redhat/rhn/taskomatic/task/repomd/RepositoryWriter.java | 9 -
java/code/src/com/redhat/rhn/taskomatic/task/repomd/RpmRepositoryWriter.java | 59 ----------
java/spacewalk-java.spec | 5
monitoring/nocpulse-common/perl-API/NOCpulse/NOCpulseini.pm | 2
rel-eng/packages/spacewalk-java | 2
web/modules/rhn/RHN/DB/DataSource/xml/System_queries.xml | 5
web/modules/rhn/RHN/DB/Server.pm | 33 -----
web/modules/rhn/RHN/DB/User.pm | 42 -------
12 files changed, 16 insertions(+), 185 deletions(-)
---
12 years, 1 month
java/spacewalk-java.spec rel-eng/packages
by Šimon Lukašík
java/spacewalk-java.spec | 5 ++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 5211022deff067dc7a39ee29d08e6199b5220214
Author: Simon Lukasik <slukasik(a)redhat.com>
Date: Sat Apr 30 21:55:25 2011 +0200
Automatic commit of package [spacewalk-java] release [1.5.13-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index f4b1bc9..e767daf 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -17,7 +17,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.5.12
+Version: 1.5.13
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -538,6 +538,9 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Sat Apr 30 2011 Simon Lukasik <slukasik(a)redhat.com> 1.5.13-1
+- Remove the static comps file mapping for RHEL 5.0 trees (slukasik(a)redhat.com)
+
* Fri Apr 29 2011 Milan Zazrivec <mzazrivec(a)redhat.com> 1.5.12-1
- remove unused imports
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 1d8f8c04..4ec78ab 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.5.12-1 java/
+1.5.13-1 java/
12 years, 1 month
java/code
by Šimon Lukašík
java/code/src/com/redhat/rhn/taskomatic/task/repomd/DebRepositoryWriter.java | 12 --
java/code/src/com/redhat/rhn/taskomatic/task/repomd/RepositoryWriter.java | 9 -
java/code/src/com/redhat/rhn/taskomatic/task/repomd/RpmRepositoryWriter.java | 59 ----------
3 files changed, 4 insertions(+), 76 deletions(-)
New commits:
commit 9aae204b9e3b4975690460dd3b8108d4855b7392
Author: Simon Lukasik <slukasik(a)redhat.com>
Date: Sat Apr 30 21:26:27 2011 +0200
Remove the static comps file mapping for RHEL 5.0 trees
Static mappings were introduced by bug 247156, but they
are no longer needed since the bug 585233 is resolved.
In any case, static mappings should not have precedence
over the cloned-channel loop.
diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/repomd/DebRepositoryWriter.java b/java/code/src/com/redhat/rhn/taskomatic/task/repomd/DebRepositoryWriter.java
index 3c4d691..04ef7c4 100644
--- a/java/code/src/com/redhat/rhn/taskomatic/task/repomd/DebRepositoryWriter.java
+++ b/java/code/src/com/redhat/rhn/taskomatic/task/repomd/DebRepositoryWriter.java
@@ -84,16 +84,4 @@ public class DebRepositoryWriter extends RepositoryWriter {
}
writer.generatePackagesGz();
}
-
- /**
- * TODO: This static comps paths should go away once
- * we can get the paths directly from hosted through
- * satellite-sync and only limit to supporting cloned,
- * there are no comps files for debian.
- * @param channel channel object
- * @return compsPath comps file path
- */
- public String getCompsFilePath(Channel channel) {
- return null;
- }
}
diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/repomd/RepositoryWriter.java b/java/code/src/com/redhat/rhn/taskomatic/task/repomd/RepositoryWriter.java
index ba68b57..31eeb74 100644
--- a/java/code/src/com/redhat/rhn/taskomatic/task/repomd/RepositoryWriter.java
+++ b/java/code/src/com/redhat/rhn/taskomatic/task/repomd/RepositoryWriter.java
@@ -55,15 +55,6 @@ public abstract class RepositoryWriter {
public abstract void writeRepomdFiles(Channel channel);
/**
- * TODO: This static comps paths should go away once
- * we can get the paths directly from hosted through
- * satellite-sync and only limit to supporting cloned.
- * @param channel channel object
- * @return compsPath comps file path
- */
- public abstract String getCompsFilePath(Channel channel);
-
- /**
* Deletes repository cache files
* @param channelLabelToProcess channel label
* @param deleteDir directory to delete
diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/repomd/RpmRepositoryWriter.java b/java/code/src/com/redhat/rhn/taskomatic/task/repomd/RpmRepositoryWriter.java
index 3ce591f..6190147 100644
--- a/java/code/src/com/redhat/rhn/taskomatic/task/repomd/RpmRepositoryWriter.java
+++ b/java/code/src/com/redhat/rhn/taskomatic/task/repomd/RpmRepositoryWriter.java
@@ -274,24 +274,18 @@ public class RpmRepositoryWriter extends RepositoryWriter {
}
private String getCompsRelativeFilename(Channel channel) {
- String relativeFilename = null;
-
- if (channel.getComps() == null) {
- relativeFilename = getCompsFilePath(channel);
- }
- else {
- relativeFilename = channel.getComps().getRelativeFilename();
+ if (channel.getComps() != null) {
+ return channel.getComps().getRelativeFilename();
}
-
// if we didn't find anything, let's check channel's original
- if (relativeFilename == null && channel.isCloned()) {
+ if (channel.isCloned()) {
// use a hack not to use ClonedChannel and it's getOriginal() method
Long originalChannelId = ChannelManager.lookupOriginalId(channel);
Channel originalChannel = ChannelFactory.lookupById(originalChannelId);
return getCompsRelativeFilename(originalChannel);
}
- return relativeFilename;
+ return null;
}
/**
@@ -343,51 +337,6 @@ public class RpmRepositoryWriter extends RepositoryWriter {
}
/**
- * TODO: This static comps paths should go away once
- * we can get the paths directly from hosted through
- * satellite-sync and only limit to supporting cloned.
- * @param channel channel object
- * @return compsPath comps file path
- */
- public String getCompsFilePath(Channel channel) {
- String compsPath = null;
-
- Map<String, String> compsMapping = new HashMap<String, String>();
- String rootClientPath = "/rhn/kickstart/ks-rhel-x86_64-client-5";
- String rootServerPath = "/rhn/kickstart/ks-rhel-x86_64-server-5";
- compsMapping.put("rhel-x86_64-client-5",
- rootClientPath + "/Client/repodata/comps-rhel5-client-core.xml");
- compsMapping.put("rhel-x86_64-client-vt-5",
- rootClientPath + "/VT/repodata/comps-rhel5-vt.xml");
- compsMapping.put("rhel-x86_64-client-workstation-5",
- rootClientPath + "/Workstation/repodata/comps-rhel5-client-workstation.xml");
- compsMapping.put("rhel-x86_64-server-5",
- rootServerPath + "/Server/repodata/comps-rhel5-server-core.xml");
- compsMapping.put("rhel-x86_64-server-vt-5",
- rootServerPath + "/VT/repodata/comps-rhel5-vt.xml");
- compsMapping.put("rhel-x86_64-server-cluster-5",
- rootServerPath + "/Cluster/repodata/comps-rhel5-cluster.xml");
- compsMapping.put("rhel-x86_64-server-cluster-storage-5",
- rootServerPath + "/ClusterStorage/repodata/comps-rhel5-cluster-st.xml");
-
- String[] arches = {"i386", "ia64", "s390x", "ppc"};
- Map<String, String> newCompsmap = new HashMap<String, String>();
- for (String k : compsMapping.keySet()) {
- for (String arch : arches) {
- newCompsmap.put(k.replace("x86_64", arch),
- compsMapping.get(k).replace("x86_64", arch));
- }
- }
- compsMapping.putAll(newCompsmap);
-
- if (compsMapping.containsKey(channel.getLabel())) {
- compsPath = compsMapping.get(channel.getLabel());
- }
-
- return compsPath;
- }
-
- /**
* Generates update info for given channel
* @param channel channel info
* @param prefix repodata file prefix
12 years, 1 month
Changes to 'refs/tags/osad-5.10.14-1'
by Miroslav Suchý
Tag 'osad-5.10.14-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2011-04-29 14:23 +0000
Tagging package [osad] version [5.10.14-1] in directory [client/tools/osad/].
Changes since spacewalk-java-1.4.37-1:
Michael Calmer (1):
provide config
Miroslav Suchý (2):
push to fedora packages which already pass package review
Automatic commit of package [osad] release [5.10.14-1].
---
client/tools/osad/osad.spec | 5 ++++-
client/tools/osad/src/osad.py | 1 +
rel-eng/packages/osad | 2 +-
rel-eng/push-packages-to-fedora.sh | 2 +-
4 files changed, 7 insertions(+), 3 deletions(-)
---
12 years, 1 month
Branch 'SPACEWALK-1.4' - 3 commits - client/tools rel-eng/packages rel-eng/push-packages-to-fedora.sh
by Miroslav Suchý
client/tools/osad/osad.spec | 5 ++++-
client/tools/osad/src/osad.py | 1 +
rel-eng/packages/osad | 2 +-
rel-eng/push-packages-to-fedora.sh | 2 +-
4 files changed, 7 insertions(+), 3 deletions(-)
New commits:
commit 3f4608b85d2ce46b343a4a3fe733c294c2f8cd39
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Fri Apr 29 16:23:33 2011 +0200
Automatic commit of package [osad] release [5.10.14-1].
diff --git a/client/tools/osad/osad.spec b/client/tools/osad/osad.spec
index cc96ef2..0ad151f 100644
--- a/client/tools/osad/osad.spec
+++ b/client/tools/osad/osad.spec
@@ -9,7 +9,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.10.9
+Version: 5.10.14
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -228,6 +228,9 @@ rpm -ql osa-dispatcher | xargs -n 1 /sbin/restorecon -rvi {}
%attr(0755,root,root) %{_sbindir}/osa-dispatcher-selinux-enable
%changelog
+* Fri Apr 29 2011 Miroslav Suchý 5.10.14-1
+- provide config
+
* Fri Apr 08 2011 Miroslav Suchý 5.10.9-1
- Revert "idn_unicode_to_pune() have to return string" (msuchy(a)redhat.com)
- update copyright years (msuchy(a)redhat.com)
diff --git a/rel-eng/packages/osad b/rel-eng/packages/osad
index c911519..1204d96 100644
--- a/rel-eng/packages/osad
+++ b/rel-eng/packages/osad
@@ -1 +1 @@
-5.10.9-1 client/tools/osad/
+5.10.14-1 client/tools/osad/
commit d71150b1f9c7cf31db222342705613631f54e9c9
Author: Michael Calmer <mc(a)suse.de>
Date: Fri Apr 15 13:16:04 2011 +0200
provide config
(cherry picked from commit 39f768dc06eb56c115bc02d660929ab55bab4148)
diff --git a/client/tools/osad/src/osad.py b/client/tools/osad/src/osad.py
index 6c2b699..1cb89ba 100644
--- a/client/tools/osad/src/osad.py
+++ b/client/tools/osad/src/osad.py
@@ -22,6 +22,7 @@ from rhn import rpclib
import random
from up2date_client.config import initUp2dateConfig
+from up2date_client import config
from rhn_log import set_debug_level, log_debug, die, set_logfile
commit 85543e2341f463f691d9d0a71e57ef7e7419ede6
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue Apr 26 14:20:13 2011 +0200
push to fedora packages which already pass package review
diff --git a/rel-eng/push-packages-to-fedora.sh b/rel-eng/push-packages-to-fedora.sh
index 779fab5..be61f5a 100755
--- a/rel-eng/push-packages-to-fedora.sh
+++ b/rel-eng/push-packages-to-fedora.sh
@@ -7,7 +7,7 @@ TOP_DIR_FEDORA=$1
# top dir of spacewalk git checkout
TOP_DIR_GIT=$2
-PACKAGE_LIST="rhnlib rhn-client-tools rhnsd yum-rhn-plugin rhncfg spacewalk-koan spacewalk-certs-tools rhnpush nocpulse-common perl-Satcon perl-NOCpulse-CLAC perl-NOCpulse-Debug perl-NOCpulse-Gritch perl-NOCpulse-Object perl-NOCpulse-SetID perl-NOCpulse-Utils spacewalk-proxy-html spacewalk-proxy-docs spacecmd spacewalk-backend spacewalk-certs-tools rhn-custom-info spacewalk-config"
+PACKAGE_LIST="rhnlib rhn-client-tools rhnsd yum-rhn-plugin rhncfg spacewalk-koan spacewalk-certs-tools rhnpush nocpulse-common perl-Satcon perl-NOCpulse-CLAC perl-NOCpulse-Debug perl-NOCpulse-Gritch perl-NOCpulse-Object perl-NOCpulse-SetID perl-NOCpulse-Utils spacewalk-proxy-html spacewalk-proxy-docs spacecmd spacewalk-backend spacewalk-certs-tools rhn-custom-info spacewalk-config rhnmd spacewalk-branding python-gzipstream"
if [ -z "$TOP_DIR_FEDORA" -o ! -d "$TOP_DIR_FEDORA" ]; then
12 years, 1 month
client/tools
by Miroslav Suchý
client/tools/osad/osad.spec | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit c0bdfc3dbfe13ed73a0b0307de9bddb32a845ffa
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Fri Apr 29 16:19:54 2011 +0200
bump up epoch, and match version of osad with spacewalk version
diff --git a/client/tools/osad/osad.spec b/client/tools/osad/osad.spec
index faf044f..38fbb51 100644
--- a/client/tools/osad/osad.spec
+++ b/client/tools/osad/osad.spec
@@ -16,7 +16,8 @@ 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.10.12
+Epoch: 1
+Version: 1.5.0
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
12 years, 1 month
monitoring/nocpulse-common
by Jan Pazdziora
monitoring/nocpulse-common/perl-API/NOCpulse/NOCpulseini.pm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 85c7648b92f73f06cc8c79fa57b6919c08e216c0
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Apr 29 16:21:13 2011 +0200
The close of IO::AtomicFile can also die, we should catch it right there.
diff --git a/monitoring/nocpulse-common/perl-API/NOCpulse/NOCpulseini.pm b/monitoring/nocpulse-common/perl-API/NOCpulse/NOCpulseini.pm
index bc3d5d7..228d868 100644
--- a/monitoring/nocpulse-common/perl-API/NOCpulse/NOCpulseini.pm
+++ b/monitoring/nocpulse-common/perl-API/NOCpulse/NOCpulseini.pm
@@ -66,7 +66,7 @@ sub save {
# You should not edit this file directly. All changes will be lost after
# Monitoring restart. Please use script NOCpulse-ini.
WARNING
- $fh->close();
+ $fh->close() or die "Error closing $filename: $!";
# Be sure to make the file world-readable!
chmod(0644, $filename) or die "Couldn't chmod $filename: $!";
}
12 years, 1 month
web/modules
by Jan Pazdziora
web/modules/rhn/RHN/DB/DataSource/xml/System_queries.xml | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
New commits:
commit ba7aa6d770bb76a1368bfcd1bdea4619bce2fad8
Author: Ville Salmela <Ville.Salmela(a)csc.fi>
Date: Fri Apr 29 14:52:34 2011 +0200
Patch to run remote commands on multiple machines on Spacewalk 1.4 PostgreSQL.
diff --git a/web/modules/rhn/RHN/DB/DataSource/xml/System_queries.xml b/web/modules/rhn/RHN/DB/DataSource/xml/System_queries.xml
index 72463fc..36e32ba 100644
--- a/web/modules/rhn/RHN/DB/DataSource/xml/System_queries.xml
+++ b/web/modules/rhn/RHN/DB/DataSource/xml/System_queries.xml
@@ -2,6 +2,7 @@
<mode name="ssm_remote_commandable">
<query params="user_id">
+select * from (
SELECT DISTINCT S.id,
S.name AS SERVER_NAME
FROM rhnServer S,
@@ -18,7 +19,9 @@ SELECT DISTINCT S.id,
AND CC.capability_name_id = CCN.id
AND CCN.name = 'script.run'
AND USP.server_id = S.id
-ORDER BY UPPER(NVL(S.NAME, '(none)')), S.ID
+) X
+ORDER BY UPPER(COALESCE(X.name, '(none)')), X.id
+
</query>
<elaborator name="system_overview" />
<elaborator name="entitlements"/>
12 years, 1 month
3 commits - web/modules
by Jan Pazdziora
web/modules/rhn/RHN/DB/Server.pm | 33 ------------------------------
web/modules/rhn/RHN/DB/User.pm | 42 ---------------------------------------
2 files changed, 75 deletions(-)
New commits:
commit 1487890c84b411b92715113b3471c4137317061b
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Apr 29 12:16:10 2011 +0200
Removal of system_value_edit makes set_custom_value unused, dropping.
diff --git a/web/modules/rhn/RHN/DB/Server.pm b/web/modules/rhn/RHN/DB/Server.pm
index 38545a3..36e5283 100644
--- a/web/modules/rhn/RHN/DB/Server.pm
+++ b/web/modules/rhn/RHN/DB/Server.pm
@@ -233,21 +233,6 @@ EOQ
return $action;
}
-sub set_custom_value {
- my $self = shift;
-
- foreach my $param (@_) {
- die "$param tainted!" if Scalar::Util::tainted($param);
- }
-
- my %params = validate(@_, {user_id => 1, key_label => 1, value => 0, transaction => 0} );
-
- my $dbh = $params{transaction} || RHN::DB->connect();
- $dbh->call_procedure('rhn_server.set_custom_value', $self->id, $params{user_id}, $params{key_label}, $params{value});
-
- $dbh->commit unless $params{transaction};
-}
-
sub bulk_set_custom_value {
my $class = shift;
my %params = validate(@_, {set_label => 1, user_id => 1, key_label => 1, value => 0});
commit 866278998b5f7bdfecb368064e2dcb38ccc14606
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Apr 29 12:14:24 2011 +0200
Removal of remove_system_value makes remove_custom_value unused, dropping.
diff --git a/web/modules/rhn/RHN/DB/Server.pm b/web/modules/rhn/RHN/DB/Server.pm
index 361afb5..38545a3 100644
--- a/web/modules/rhn/RHN/DB/Server.pm
+++ b/web/modules/rhn/RHN/DB/Server.pm
@@ -233,24 +233,6 @@ EOQ
return $action;
}
-sub remove_custom_value {
- my $self = shift;
- my $key_id = shift;
-
- die "no key id" unless $key_id;
-
- my $dbh = RHN::DB->connect();
- my $sth = $dbh->prepare(<<EOQ);
-DELETE FROM rhnServerCustomDataValue
- WHERE server_id = :server_id
- AND key_id = :key_id
-EOQ
-
- $sth->execute_h(server_id => $self->id, key_id => $key_id);
-
- $dbh->commit;
-}
-
sub set_custom_value {
my $self = shift;
commit 21448e8a0f8b33bc27612121f873fcc23867ca03
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Apr 29 12:11:36 2011 +0200
The can_delete_custominfokey no longer used after previous removals, removing.
diff --git a/web/modules/rhn/RHN/DB/User.pm b/web/modules/rhn/RHN/DB/User.pm
index 9164f67..4d804df 100644
--- a/web/modules/rhn/RHN/DB/User.pm
+++ b/web/modules/rhn/RHN/DB/User.pm
@@ -1781,48 +1781,6 @@ sub lock_web_contact {
}
-sub can_delete_custominfokey {
- my $self = shift;
- my $key_id = shift;
-
- my $key = RHN::CustomInfoKey->lookup(-id => $key_id);
-
- throw 'no key' unless $key;
-
- return 1 if $self->is('org_admin');
-
-# unless (defined $key->creator_id) {
-# return 0;
-# }
-#
-# unless ($key->creator_id == $self->id) {
-# return 0;
-# }
-
- my $dbh = RHN::DB->connect();
- my $sth = $dbh->prepare(<<EOQ);
-SELECT 1
- FROM rhnServerCustomDataValue SCDV,
- rhnServer S
- WHERE S.org_id = :org_id
- AND S.id = SCDV.server_id
- AND SCDV.key_id = :key_id
- AND NOT EXISTS (SELECT 1 FROM rhnUserServerPerms USP WHERE user_id = :user_id AND server_id = S.id)
-EOQ
-
- $sth->execute_h(user_id => $self->id,
- org_id => $self->org_id,
- key_id => $key_id,
- );
-
- my ($row) = $sth->fetchrow;
- $sth->finish;
-
- return 0 if defined $row;
-
- return 1;
-}
-
sub manages_a_channel {
my $self = shift;
12 years, 1 month
backend/server
by Jan Pazdziora
backend/server/rhnServer/server_wrapper.py | 5 -----
1 file changed, 5 deletions(-)
New commits:
commit f27c68d620864013343fdcf0e975aaf8d4fd13a8
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Apr 29 12:03:59 2011 +0200
Method reload_packages not used in our code, removing.
diff --git a/backend/server/rhnServer/server_wrapper.py b/backend/server/rhnServer/server_wrapper.py
index 8d5740e..758a6b6 100644
--- a/backend/server/rhnServer/server_wrapper.py
+++ b/backend/server/rhnServer/server_wrapper.py
@@ -78,11 +78,6 @@ class ServerWrapper(Packages, Hardware, History, SolarisPatches):
rhnSQL.commit()
return ret
- def reload_packages(self):
- """ wrapper for the Packages.reload_packages_byid() which requires the sysid """
- ret = self.reload_packages_byid(self.server["id"])
- return ret
-
###
### HARDWARE
###
12 years, 1 month