4 commits - java/code java/spacewalk-java.spec rel-eng/packages web/conf web/html web/spacewalk-web.spec
by aparsons
java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml | 3 ++-
java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java | 1 +
java/spacewalk-java.spec | 5 ++++-
rel-eng/packages/spacewalk-java | 2 +-
rel-eng/packages/spacewalk-web | 2 +-
web/conf/rhn_web.conf | 2 +-
web/html/nav/styles | 1 +
web/spacewalk-web.spec | 5 ++++-
8 files changed, 15 insertions(+), 6 deletions(-)
New commits:
commit 159daa2f89fea7caeab13b64d1abf71918fb1d8d
Author: Aron Parsons <aparsons(a)redhat.com>
Date: Thu Dec 23 12:43:25 2010 -0500
Automatic commit of package [spacewalk-web] release [1.3.18-1].
diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web
index 779eb4e..3a485f7 100644
--- a/rel-eng/packages/spacewalk-web
+++ b/rel-eng/packages/spacewalk-web
@@ -1 +1 @@
-1.3.17-1 web/
+1.3.18-1 web/
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index 2b25e83..2bdcf23 100644
--- a/web/spacewalk-web.spec
+++ b/web/spacewalk-web.spec
@@ -2,7 +2,7 @@ Name: spacewalk-web
Summary: Spacewalk Web site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.3.17
+Version: 1.3.18
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -255,6 +255,9 @@ rm -rf $RPM_BUILD_ROOT
# $Id$
%changelog
+* Thu Dec 23 2010 Aron Parsons <aparsons(a)redhat.com> 1.3.18-1
+- bump API version number for recent API changes (aparsons(a)redhat.com)
+
* Thu Dec 23 2010 Jan Pazdziora 1.3.17-1
- Since ssm_channel_change_conf is gone, ssm_channel_change_conf_provider is
not used anymore, removing.
commit bac948a6af823bf36275d22a05819ffa6af70411
Author: Aron Parsons <aparsons(a)redhat.com>
Date: Thu Dec 23 12:42:41 2010 -0500
Automatic commit of package [spacewalk-java] release [1.3.33-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 6741550..1f55fc9 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.3.32
+Version: 1.3.33
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -456,6 +456,9 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Thu Dec 23 2010 Aron Parsons <aparsons(a)redhat.com> 1.3.33-1
+- add package ID to array returned by system.listPackages API call
+
* Wed Dec 22 2010 Tomas Lestach <tlestach(a)redhat.com> 1.3.32-1
- 640928 - convert List<Integer> serverIds to List<Long> (tlestach(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index c955716..717afff 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.3.32-1 java/
+1.3.33-1 java/
commit 6942adf3af22be062f338b20bc366d31c1d9a138
Author: Aron Parsons <aparsons(a)redhat.com>
Date: Thu Dec 23 12:39:39 2010 -0500
bump API version number for recent API changes
diff --git a/web/conf/rhn_web.conf b/web/conf/rhn_web.conf
index d277424..dfa59a4 100644
--- a/web/conf/rhn_web.conf
+++ b/web/conf/rhn_web.conf
@@ -225,7 +225,7 @@ web.config_delim_end = |}
web.version = 1.3 nightly
# the version of API
-web.apiversion = 10.15
+web.apiversion = 10.16
# maximum size for a config file
web.maximum_config_file_size = 131072
diff --git a/web/html/nav/styles b/web/html/nav/styles
new file mode 120000
index 0000000..dbfef52
--- /dev/null
+++ b/web/html/nav/styles
@@ -0,0 +1 @@
+/home/spacewalk/spacewalk/branding/styles
\ No newline at end of file
commit ceccae97e862eed4bd2ea9470a5974fe59f09bb3
Author: Aron Parsons <aparsons(a)redhat.com>
Date: Thu Dec 23 12:39:01 2010 -0500
add package ID to array returned by system.listPackages API call
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml
index c9a1b3b..baa5bd3 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml
@@ -1322,7 +1322,8 @@ SELECT PN.name,
PE.release,
coalesce(PE.epoch, ' ') as epoch,
PA.name as arch,
- SP.installtime
+ SP.installtime,
+ PN.id
FROM rhnServerPackage SP inner join
rhnPackageName PN on PN.id = SP.name_id inner join
rhnPackageEVR PE on PE.id = SP.evr_id left join
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java
index 7e40a89..b6e8566 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java
@@ -1191,6 +1191,7 @@ public class SystemHandler extends BaseHandler {
* @xmlrpc.returntype
* #array()
* #struct("package")
+ * #prop("int", "id")
* #prop("string", "name")
* #prop("string", "version")
* #prop("string", "release")
13 years, 4 months
Changes to 'refs/tags/spacewalk-schema-1.3.8-1'
by Jan Pazdziora
Tag 'spacewalk-schema-1.3.8-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2010-12-23 15:15 +0000
Tagging package [spacewalk-schema] version [1.3.8-1] in directory [schema/spacewalk/].
Changes since spacewalk-web-1.3.17-1:
Jan Pazdziora (1):
Automatic commit of package [spacewalk-schema] release [1.3.8-1].
---
rel-eng/packages/spacewalk-schema | 2 +-
schema/spacewalk/spacewalk-schema.spec | 7 ++++++-
2 files changed, 7 insertions(+), 2 deletions(-)
---
13 years, 4 months
rel-eng/packages schema/spacewalk
by Jan Pazdziora
rel-eng/packages/spacewalk-schema | 2 +-
schema/spacewalk/spacewalk-schema.spec | 7 ++++++-
2 files changed, 7 insertions(+), 2 deletions(-)
New commits:
commit de1dc9838809b8c8d444619776947d8356f120ff
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Dec 23 16:15:06 2010 +0100
Automatic commit of package [spacewalk-schema] release [1.3.8-1].
diff --git a/rel-eng/packages/spacewalk-schema b/rel-eng/packages/spacewalk-schema
index 2630a50..09b4931 100644
--- a/rel-eng/packages/spacewalk-schema
+++ b/rel-eng/packages/spacewalk-schema
@@ -1 +1 @@
-1.3.7-1 schema/spacewalk/
+1.3.8-1 schema/spacewalk/
diff --git a/schema/spacewalk/spacewalk-schema.spec b/schema/spacewalk/spacewalk-schema.spec
index 938c150..bf190d2 100644
--- a/schema/spacewalk/spacewalk-schema.spec
+++ b/schema/spacewalk/spacewalk-schema.spec
@@ -2,7 +2,7 @@ Name: spacewalk-schema
Group: Applications/Internet
Summary: Oracle SQL schema for Spacewalk server
-Version: 1.3.7
+Version: 1.3.8
Release: 1%{?dist}
Source0: %{name}-%{version}.tar.gz
@@ -59,6 +59,11 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/spacewalk-schema-upgrade*
%changelog
+* Thu Dec 23 2010 Jan Pazdziora 1.3.8-1
+- Mark PostgreSQL rhn_user schema as equivalent to the Oracle package.
+- Dropping rhn_user.add_users_to_usergroups as it is now used anymore.
+- Dropping rhn_user.remove_users_from_servergroups as it is not used anywhere.
+
* Thu Dec 23 2010 Jan Pazdziora 1.3.7-1
- Marking PostgreSQL rpm schema equivalent to the Oracle package.
- Fix PostgreSQL rpm.vercmp to handle empty string epoch gracefully.
13 years, 4 months
Changes to 'refs/tags/spacewalk-web-1.3.17-1'
by Jan Pazdziora
Tag 'spacewalk-web-1.3.17-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2010-12-23 15:14 +0000
Tagging package [spacewalk-web] version [1.3.17-1] in directory [web/].
Changes since spacewalk-setup-1.3.3-1:
Jan Pazdziora (7):
RHN::UserActions not used anywhere, removing.
Dropping rhn_user.remove_users_from_servergroups as it is not used anywhere.
Dropping rhn_user.add_users_to_usergroups as it is now used anymore.
Mark PostgreSQL rhn_user schema as equivalent to the Oracle package.
Package RHN::Access::Errata not used, removing.
Since ssm_channel_change_conf is gone, ssm_channel_change_conf_provider is not used anymore, removing.
Automatic commit of package [spacewalk-web] release [1.3.17-1].
---
0, | 1
rel-eng/packages/spacewalk-web | 2
schema/spacewalk/oracle/packages/rhn_user.pkb | 35 -
schema/spacewalk/oracle/packages/rhn_user.pks | 12
schema/spacewalk/postgres/packages/rhn_user.pkb | 45 -
schema/spacewalk/postgres/packages/rhn_user.pks | 20
schema/spacewalk/upgrade/spacewalk-schema-1.2-to-spacewalk-schema-1.3/012-rhn_user.sql | 54 ++
schema/spacewalk/upgrade/spacewalk-schema-1.2-to-spacewalk-schema-1.3/013-rhn_user-body.sql | 252 ++++++++++
web/modules/rhn/MANIFEST | 2
web/modules/rhn/RHN/Access/Errata.pm | 67 --
web/modules/rhn/RHN/DB/UserActions.pm | 79 ---
web/modules/rhn/RHN/UserActions.pm | 22
web/modules/sniglets/Sniglets/ListView/SystemList.pm | 17
web/modules/sniglets/Sniglets/Users.pm | 1
web/spacewalk-web.spec | 9
15 files changed, 320 insertions(+), 298 deletions(-)
---
13 years, 4 months
rel-eng/packages web/spacewalk-web.spec
by Jan Pazdziora
rel-eng/packages/spacewalk-web | 2 +-
web/spacewalk-web.spec | 8 +++++++-
2 files changed, 8 insertions(+), 2 deletions(-)
New commits:
commit 17d68e001813eb6cb4bb820545597dbec0aafc13
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Dec 23 16:14:20 2010 +0100
Automatic commit of package [spacewalk-web] release [1.3.17-1].
diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web
index 6010190..779eb4e 100644
--- a/rel-eng/packages/spacewalk-web
+++ b/rel-eng/packages/spacewalk-web
@@ -1 +1 @@
-1.3.16-1 web/
+1.3.17-1 web/
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index 77a7491..2b25e83 100644
--- a/web/spacewalk-web.spec
+++ b/web/spacewalk-web.spec
@@ -2,7 +2,7 @@ Name: spacewalk-web
Summary: Spacewalk Web site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.3.16
+Version: 1.3.17
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -255,6 +255,12 @@ rm -rf $RPM_BUILD_ROOT
# $Id$
%changelog
+* Thu Dec 23 2010 Jan Pazdziora 1.3.17-1
+- Since ssm_channel_change_conf is gone, ssm_channel_change_conf_provider is
+ not used anymore, removing.
+- Package RHN::Access::Errata not used, removing.
+- RHN::UserActions not used anywhere, removing.
+
* Tue Dec 21 2010 Michael Mraka <michael.mraka(a)redhat.com> 1.3.16-1
- 664487 - fixed space report query
- fixed prototype-*.js reference
13 years, 4 months
web/modules
by Jan Pazdziora
web/modules/sniglets/Sniglets/ListView/SystemList.pm | 17 -----------------
1 file changed, 17 deletions(-)
New commits:
commit 26a910f6c4b2b3a0f428c94e787cc1c5967f8346
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Dec 23 16:13:20 2010 +0100
Since ssm_channel_change_conf is gone, ssm_channel_change_conf_provider is not used anymore, removing.
diff --git a/web/modules/sniglets/Sniglets/ListView/SystemList.pm b/web/modules/sniglets/Sniglets/ListView/SystemList.pm
index de0ab86..d827fc1 100644
--- a/web/modules/sniglets/Sniglets/ListView/SystemList.pm
+++ b/web/modules/sniglets/Sniglets/ListView/SystemList.pm
@@ -641,23 +641,6 @@ sub system_set_verify_packages_conf_provider {
return (%ret);
}
-sub ssm_channel_change_conf_provider {
- my $self = shift;
- my $pxt = shift;
-
- my %ret = $self->default_provider($pxt);
-
- my $data = $ret{data};
-
- foreach my $row (@{$data}) {
- $row->{SERVER_NAME} = $row->{__data__}->[0]->{SERVER_NAME};
- $row->{CHANNELS_TO_UNSUBSCRIBE} = join("<br />\n", map {$_->{CHANNEL_NAME}} grep { $_->{ACTION} eq 'unsubscribe' } @{$row->{__data__}});
- $row->{CHANNELS_TO_SUBSCRIBE} = join("<br />\n", map {$_->{CHANNEL_NAME}} grep { $_->{ACTION} eq 'subscribe' } @{$row->{__data__}});
- }
-
- return %ret;
-}
-
sub row_callback {
my $self = shift;
my $row = shift;
13 years, 4 months
web/modules
by Jan Pazdziora
web/modules/rhn/RHN/Access/Errata.pm | 67 -----------------------------------
1 file changed, 67 deletions(-)
New commits:
commit 314eddb8842256c38af7ce4da86432bb827b1d83
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Dec 23 16:07:17 2010 +0100
Package RHN::Access::Errata not used, removing.
diff --git a/web/modules/rhn/RHN/Access/Errata.pm b/web/modules/rhn/RHN/Access/Errata.pm
deleted file mode 100644
index 8f585f7..0000000
--- a/web/modules/rhn/RHN/Access/Errata.pm
+++ /dev/null
@@ -1,67 +0,0 @@
-#
-# Copyright (c) 2008--2010 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 RHN::Access::Errata;
-
-use strict;
-use RHN::ErrataTmp;
-use PXT::ACL;
-
-sub register_acl_handlers {
- my $self = shift;
- my $acl = shift;
-
- $acl->register_handler(errata_exists => \&errata_exists);
- $acl->register_handler(errata_published => \&errata_published);
- $acl->register_handler(errata_owned => \&errata_owned);
-}
-
-#really just looks to see if the 'eid' formvar is present
-sub errata_exists {
- my $pxt = shift;
- my $eid = $pxt->param('eid');
-
- return 0 unless $eid;
-
- return 1;
-}
-
-sub errata_published {
- my $pxt = shift;
- my $eid = $pxt->param('eid');
-
- return 0 unless $eid;
-
- my $errata = RHN::ErrataTmp->lookup_managed_errata(-id => $eid);
-
- return 0 if ($errata->isa('RHN::DB::ErrataTmp'));
-
- return 1;
-}
-
-sub errata_owned {
- my $pxt = shift;
- my $eid = $pxt->param('eid');
-
- return 0 unless $eid;
-
- my $errata = RHN::ErrataTmp->lookup_managed_errata(-id => $eid);
-
- return 0 unless ( ($errata->org_id || 0) == ($pxt->user->org_id || 0) );
-
- return 1;
-}
-
-1;
13 years, 4 months
4 commits - schema/spacewalk web/modules web/spacewalk-web.spec
by Jan Pazdziora
0, | 1
schema/spacewalk/oracle/packages/rhn_user.pkb | 35 -
schema/spacewalk/oracle/packages/rhn_user.pks | 12
schema/spacewalk/postgres/packages/rhn_user.pkb | 45 -
schema/spacewalk/postgres/packages/rhn_user.pks | 20
schema/spacewalk/upgrade/spacewalk-schema-1.2-to-spacewalk-schema-1.3/012-rhn_user.sql | 54 ++
schema/spacewalk/upgrade/spacewalk-schema-1.2-to-spacewalk-schema-1.3/013-rhn_user-body.sql | 252 ++++++++++
web/modules/rhn/MANIFEST | 2
web/modules/rhn/RHN/DB/UserActions.pm | 79 ---
web/modules/rhn/RHN/UserActions.pm | 22
web/modules/sniglets/Sniglets/Users.pm | 1
web/spacewalk-web.spec | 1
12 files changed, 312 insertions(+), 212 deletions(-)
New commits:
commit 1eb3a390afd02b9dd8dc6305bbaa1fab27e612f8
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Dec 23 15:57:02 2010 +0100
Mark PostgreSQL rhn_user schema as equivalent to the Oracle package.
diff --git a/schema/spacewalk/postgres/packages/rhn_user.pkb b/schema/spacewalk/postgres/packages/rhn_user.pkb
index 05a4395..723b4f9 100644
--- a/schema/spacewalk/postgres/packages/rhn_user.pkb
+++ b/schema/spacewalk/postgres/packages/rhn_user.pkb
@@ -1,3 +1,4 @@
+-- oracle equivalent source sha1 933cd1f52ab0cff6e55450f5882a7efbfeddf870
--
-- Copyright (c) 2008--2010 Red Hat, Inc.
--
diff --git a/schema/spacewalk/postgres/packages/rhn_user.pks b/schema/spacewalk/postgres/packages/rhn_user.pks
index 7255a9d..47a7192 100644
--- a/schema/spacewalk/postgres/packages/rhn_user.pks
+++ b/schema/spacewalk/postgres/packages/rhn_user.pks
@@ -1,3 +1,4 @@
+-- oracle equivalent source sha1 054658f16439e0bb3772d52b90edd7a1e7b4feff
--
-- Copyright (c) 2008--2010 Red Hat, Inc.
--
commit 8bdcb4e98608476a6cb4aec30f1c2693ad4e94db
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Dec 23 15:52:33 2010 +0100
Dropping rhn_user.add_users_to_usergroups as it is now used anymore.
diff --git a/schema/spacewalk/oracle/packages/rhn_user.pkb b/schema/spacewalk/oracle/packages/rhn_user.pkb
index 9ca7ebf..29688b8 100644
--- a/schema/spacewalk/oracle/packages/rhn_user.pkb
+++ b/schema/spacewalk/oracle/packages/rhn_user.pkb
@@ -216,21 +216,6 @@ is
end loop;
end add_to_usergroup;
- procedure add_users_to_usergroups(
- user_id_in in number
- ) is
- cursor ugms is
- select element user_id,
- element_two user_group_id
- from rhnSet
- where user_id = user_id_in
- and label = 'user_group_list';
- begin
- for ugm in ugms loop
- rhn_user.add_to_usergroup(ugm.user_id, ugm.user_group_id);
- end loop;
- end add_users_to_usergroups;
-
procedure remove_from_usergroup(
user_id_in in number,
user_group_id_in in number
diff --git a/schema/spacewalk/oracle/packages/rhn_user.pks b/schema/spacewalk/oracle/packages/rhn_user.pks
index ad83406..3adfc8e 100644
--- a/schema/spacewalk/oracle/packages/rhn_user.pks
+++ b/schema/spacewalk/oracle/packages/rhn_user.pks
@@ -44,10 +44,6 @@ is
user_group_id_in in number
);
- procedure add_users_to_usergroups(
- user_id_in in number
- );
-
procedure remove_from_usergroup(
user_id_in in number,
user_group_id_in in number
diff --git a/schema/spacewalk/postgres/packages/rhn_user.pkb b/schema/spacewalk/postgres/packages/rhn_user.pkb
index 6931e58..05a4395 100644
--- a/schema/spacewalk/postgres/packages/rhn_user.pkb
+++ b/schema/spacewalk/postgres/packages/rhn_user.pkb
@@ -236,25 +236,6 @@ create or replace
$$ language plpgsql;
create or replace
- function add_users_to_usergroups(
- user_id_in in numeric
- ) returns void as $$
- declare
- ugm record;
- begin
- for ugm in
- select element as user_id,
- element_two as user_group_id
- from rhnSet
- where user_id = user_id_in
- and label = 'user_group_list'
- loop
- perform rhn_user.add_to_usergroup(ugm.user_id, ugm.user_group_id);
- end loop;
- end;
-$$ language plpgsql;
-
-create or replace
function remove_from_usergroup(
user_id_in in numeric,
user_group_id_in in numeric
diff --git a/schema/spacewalk/postgres/packages/rhn_user.pks b/schema/spacewalk/postgres/packages/rhn_user.pks
index 2d51425..7255a9d 100644
--- a/schema/spacewalk/postgres/packages/rhn_user.pks
+++ b/schema/spacewalk/postgres/packages/rhn_user.pks
@@ -90,14 +90,6 @@ begin
end;
$$ language plpgsql;
-create or replace function add_users_to_usergroups(user_id_in in numeric)
-returns void
-as $$
-begin
- raise exception 'Stub called, must be replace by .pkb';
-end;
-$$ language plpgsql;
-
create or replace function remove_from_usergroup(user_id_in in numeric, user_group_id_in in numeric)
returns void
as $$
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.2-to-spacewalk-schema-1.3/012-rhn_user.sql b/schema/spacewalk/upgrade/spacewalk-schema-1.2-to-spacewalk-schema-1.3/012-rhn_user.sql
index 5b9ddb0..3adfc8e 100644
--- a/schema/spacewalk/upgrade/spacewalk-schema-1.2-to-spacewalk-schema-1.3/012-rhn_user.sql
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.2-to-spacewalk-schema-1.3/012-rhn_user.sql
@@ -1,5 +1,5 @@
--
--- Copyright (c) 2008 Red Hat, Inc.
+-- Copyright (c) 2008--2010 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
@@ -44,10 +44,6 @@ is
user_group_id_in in number
);
- procedure add_users_to_usergroups(
- user_id_in in number
- );
-
procedure remove_from_usergroup(
user_id_in in number,
user_group_id_in in number
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.2-to-spacewalk-schema-1.3/013-rhn_user-body.sql b/schema/spacewalk/upgrade/spacewalk-schema-1.2-to-spacewalk-schema-1.3/013-rhn_user-body.sql
index 47ab781..1330aaf 100644
--- a/schema/spacewalk/upgrade/spacewalk-schema-1.2-to-spacewalk-schema-1.3/013-rhn_user-body.sql
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.2-to-spacewalk-schema-1.3/013-rhn_user-body.sql
@@ -219,21 +219,6 @@ is
end loop;
end add_to_usergroup;
- procedure add_users_to_usergroups(
- user_id_in in number
- ) is
- cursor ugms is
- select element user_id,
- element_two user_group_id
- from rhnSet
- where user_id = user_id_in
- and label = 'user_group_list';
- begin
- for ugm in ugms loop
- rhn_user.add_to_usergroup(ugm.user_id, ugm.user_group_id);
- end loop;
- end add_users_to_usergroups;
-
procedure remove_from_usergroup(
user_id_in in number,
user_group_id_in in number
commit 63b1566f75fda6a44c1c4b38853c4c3d5af24092
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Dec 23 15:48:33 2010 +0100
Dropping rhn_user.remove_users_from_servergroups as it is not used anywhere.
diff --git a/schema/spacewalk/oracle/packages/rhn_user.pkb b/schema/spacewalk/oracle/packages/rhn_user.pkb
index 8ccf09f..9ca7ebf 100644
--- a/schema/spacewalk/oracle/packages/rhn_user.pkb
+++ b/schema/spacewalk/oracle/packages/rhn_user.pkb
@@ -1,5 +1,5 @@
--
--- Copyright (c) 2008 Red Hat, Inc.
+-- Copyright (c) 2008--2010 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
@@ -12,9 +12,6 @@
-- granted to use or replicate Red Hat trademarks that are incorporated
-- in this software or its documentation.
--
---
---
---
create or replace
package body rhn_user
@@ -262,47 +259,6 @@ is
end loop;
end remove_from_usergroup;
- procedure remove_users_from_servergroups(
- user_id_in in number
- ) is
- cursor ugms is
- select element user_id,
- element_two user_group_id
- from rhnSet
- where user_id = user_id_in
- and label = 'user_group_list';
- begin
- for ugm in ugms loop
- rhn_user.remove_from_usergroup(ugm.user_id, ugm.user_group_id);
- end loop;
- end remove_users_from_servergroups;
end rhn_user;
/
SHOW ERRORS
-
--- select rhn_user.get_org_id(502474) from dual;
--- 1271287
--- select rhn_user.check_role(502474, 'org_admin') from dual;
--- 1
--- select rhn_user.check_role(502474, 'org_admin_nope') from dual;
--- 0, but should later raise an exception
-
---
---
--- Revision 1.8 2004/07/12 19:35:51 pjones
--- bugzilla: 125937 -- we _always_ delete, but only rebuild cache on org_admin.
---
--- Revision 1.7 2004/07/02 22:29:36 pjones
--- bugzilla: none -- typos and spelling errors.
---
--- Revision 1.6 2004/07/02 19:16:54 pjones
--- bugzilla: 125937 -- tools to manipulate rhnServerGroupMembers and
--- rhnUserGroupMembers
---
--- Revision 1.5 2004/03/31 21:09:47 pjones
--- bugzilla: none -- if the user truly doesn't have any email address, compensate.
---
--- Revision 1.4 2004/02/12 20:53:30 pjones
--- bugzilla: 108212 -- s/get_email_address/find_mailable_address/ and make it
--- do the same as web's version
---
diff --git a/schema/spacewalk/oracle/packages/rhn_user.pks b/schema/spacewalk/oracle/packages/rhn_user.pks
index 90199d1..ad83406 100644
--- a/schema/spacewalk/oracle/packages/rhn_user.pks
+++ b/schema/spacewalk/oracle/packages/rhn_user.pks
@@ -1,5 +1,5 @@
--
--- Copyright (c) 2008 Red Hat, Inc.
+-- Copyright (c) 2008--2010 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
@@ -12,9 +12,6 @@
-- granted to use or replicate Red Hat trademarks that are incorporated
-- in this software or its documentation.
--
---
---
---
create or replace
package rhn_user
@@ -56,9 +53,6 @@ is
user_group_id_in in number
);
- procedure remove_users_from_servergroups(
- user_id_in in number
- );
end rhn_user;
/
SHOW ERRORS
diff --git a/schema/spacewalk/postgres/packages/rhn_user.pkb b/schema/spacewalk/postgres/packages/rhn_user.pkb
index 42ab1c9..6931e58 100644
--- a/schema/spacewalk/postgres/packages/rhn_user.pkb
+++ b/schema/spacewalk/postgres/packages/rhn_user.pkb
@@ -1,5 +1,5 @@
--
--- Copyright (c) 2008 Red Hat, Inc.
+-- Copyright (c) 2008--2010 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
@@ -12,9 +12,6 @@
-- granted to use or replicate Red Hat trademarks that are incorporated
-- in this software or its documentation.
--
---
---
---
-- create schema rhn_user;
@@ -289,25 +286,5 @@ create or replace
end;
$$ language plpgsql;
-create or replace
- function remove_users_from_servergroups(
- user_id_in in numeric
- ) returns void as $$
- declare
- ugm record;
- begin
- for ugm in
- select element as user_id,
- element_two as user_group_id
- from rhnSet
- where user_id = user_id_in
- and label = 'user_group_list'
- loop
- perform rhn_user.remove_from_usergroup(ugm.user_id, ugm.user_group_id);
- end loop;
- end;
-$$ language plpgsql;
-
-- restore the original setting
update pg_settings set setting = overlay( setting placing '' from 1 for (length('rhn_user')+1) ) where name = 'search_path';
-
diff --git a/schema/spacewalk/postgres/packages/rhn_user.pks b/schema/spacewalk/postgres/packages/rhn_user.pks
index dedcc37..2d51425 100644
--- a/schema/spacewalk/postgres/packages/rhn_user.pks
+++ b/schema/spacewalk/postgres/packages/rhn_user.pks
@@ -1,5 +1,5 @@
--
--- Copyright (c) 2008 Red Hat, Inc.
+-- Copyright (c) 2008--2010 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
@@ -12,7 +12,6 @@
-- granted to use or replicate Red Hat trademarks that are incorporated
-- in this software or its documentation.
--
---
create schema rhn_user;
@@ -107,13 +106,5 @@ begin
end;
$$ language plpgsql;
-create or replace function remove_users_from_servergroups(user_id_in in numeric)
-returns void
-as $$
-begin
- raise exception 'Stub called, must be replace by .pkb';
-end;
-$$ language plpgsql;
-
-- restore the original setting
update pg_settings set setting = overlay( setting placing '' from 1 for (length('rhn_user')+1) ) where name = 'search_path';
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.2-to-spacewalk-schema-1.3/012-rhn_user.sql b/schema/spacewalk/upgrade/spacewalk-schema-1.2-to-spacewalk-schema-1.3/012-rhn_user.sql
new file mode 100644
index 0000000..5b9ddb0
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.2-to-spacewalk-schema-1.3/012-rhn_user.sql
@@ -0,0 +1,58 @@
+--
+-- Copyright (c) 2008 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.
+--
+
+create or replace
+package rhn_user
+is
+ version varchar2(100) := '';
+
+ function check_role(user_id_in in number, role_in in varchar2) return number;
+ PRAGMA RESTRICT_REFERENCES(check_role, WNDS, RNPS, WNPS);
+
+ function check_role_implied(user_id_in in number, role_in in varchar2) return number;
+ PRAGMA RESTRICT_REFERENCES(check_role_implied, WNDS, RNPS, WNPS);
+
+ function get_org_id(user_id_in in number) return number;
+ PRAGMA RESTRICT_REFERENCES(get_org_id, WNDS, RNPS, WNPS);
+
+ function find_mailable_address(user_id_in in number) return varchar2;
+
+ procedure add_servergroup_perm(
+ user_id_in in number,
+ server_group_id_in in number
+ );
+
+ procedure remove_servergroup_perm(
+ user_id_in in number,
+ server_group_id_in in number
+ );
+
+ procedure add_to_usergroup(
+ user_id_in in number,
+ user_group_id_in in number
+ );
+
+ procedure add_users_to_usergroups(
+ user_id_in in number
+ );
+
+ procedure remove_from_usergroup(
+ user_id_in in number,
+ user_group_id_in in number
+ );
+
+end rhn_user;
+/
+SHOW ERRORS
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.2-to-spacewalk-schema-1.3/013-rhn_user-body.sql b/schema/spacewalk/upgrade/spacewalk-schema-1.2-to-spacewalk-schema-1.3/013-rhn_user-body.sql
new file mode 100644
index 0000000..47ab781
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.2-to-spacewalk-schema-1.3/013-rhn_user-body.sql
@@ -0,0 +1,267 @@
+--
+-- Copyright (c) 2008--2010 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.
+--
+--
+--
+--
+
+create or replace
+package body rhn_user
+is
+ body_version varchar2(100) := '';
+
+ function check_role(user_id_in in number, role_in in varchar2)
+ return number
+ is
+ throwaway number;
+ begin
+ -- the idea: if we get past this query, the org has the setting, else catch the exception and return 0
+ select 1 into throwaway
+ from rhnUserGroupType UGT,
+ rhnUserGroup UG,
+ rhnUserGroupMembers UGM
+ where UGM.user_id = user_id_in
+ and UGM.user_group_id = UG.id
+ and UG.group_type = UGT.id
+ and UGT.label = role_in;
+
+ return 1;
+ exception
+ when no_data_found
+ then
+ return 0;
+ end check_role;
+
+ function check_role_implied(user_id_in in number, role_in in varchar2)
+ return number
+ is
+ throwaway number;
+ begin
+ -- if the user directly has the role, they win
+ if rhn_user.check_role(user_id_in, role_in) = 1
+ then
+ return 1;
+ end if;
+
+ -- config_admin and channel_admin are automatically implied for org admins
+ if role_in = 'config_admin' and rhn_user.check_role(user_id_in, 'org_admin') = 1
+ then
+ return 1;
+ end if;
+
+ if role_in = 'channel_admin' and rhn_user.check_role(user_id_in, 'org_admin') = 1
+ then
+ return 1;
+ end if;
+
+ return 0;
+ end check_role_implied;
+
+ function get_org_id(user_id_in in number)
+ return number
+ is
+ org_id_out number;
+ begin
+ select org_id into org_id_out
+ from web_contact
+ where id = user_id_in;
+
+ return org_id_out;
+ end get_org_id;
+
+ -- paid users often don't have verified email addresses, so
+ -- try to find an address that is useful to us.
+ function find_mailable_address(user_id_in in number)
+ return varchar2 is
+ PRAGMA AUTONOMOUS_TRANSACTION;
+ -- this would be so much prettier if we just had an order built
+ -- into rhnEmailAddressState
+ cursor addrs is
+ select ea.state_id, ea.address
+ from rhnEmailAddressState eas,
+ rhnEmailAddress ea
+ where ea.user_id = user_id_in
+ and eas.label = 'verified'
+ and ea.state_id = eas.id
+ union all
+ select ea.state_id, ea.address
+ from rhnEmailAddressState eas,
+ rhnEmailAddress ea
+ where ea.user_id = user_id_in
+ and eas.label = 'unverified'
+ and ea.state_id = eas.id
+ union all
+ select ea.state_id, ea.address
+ from rhnEmailAddressState eas,
+ rhnEmailAddress ea
+ where ea.user_id = user_id_in
+ and eas.label = 'pending'
+ and ea.state_id = eas.id
+ union all
+ select ea.state_id, ea.address
+ from rhnEmailAddressState eas,
+ rhnEmailAddress ea
+ where ea.user_id = user_id_in
+ and eas.label = 'pending_warned'
+ and ea.state_id = eas.id
+ union all
+ select ea.state_id, ea.address
+ from rhnEmailAddressState eas,
+ rhnEmailAddress ea
+ where ea.user_id = user_id_in
+ and eas.label = 'needs_verifying'
+ and ea.state_id = eas.id
+ union all
+ select -1 state_id,
+ email address
+ from web_user_personal_info
+ where web_user_id = user_id_in;
+ retval rhnEmailAddress.address%TYPE;
+ begin
+ for addr in addrs loop
+ retval := addr.address;
+ if addr.address is null then
+ update web_user_contact_permission
+ set email = 'N'
+ where web_user_id = user_id_in;
+ commit;
+ return null;
+ end if;
+ if addr.state_id = -1 then
+ insert into rhnEmailAddress (
+ id, address,
+ user_id, state_id
+ ) (
+ select rhn_eaddress_id_seq.nextval, addr.address,
+ user_id_in, eas.id
+ from rhnEmailAddressState eas
+ where eas.label = 'unverified'
+ );
+ end if;
+ commit;
+ return retval;
+ end loop;
+ return null;
+ end;
+
+ procedure add_servergroup_perm(
+ user_id_in in number,
+ server_group_id_in in number
+ ) is
+ cursor orgs_match is
+ select 1
+ from rhnServerGroup sg,
+ web_contact u
+ where u.id = user_id_in
+ and sg.id = server_group_id_in
+ and sg.org_id = u.org_id;
+ begin
+ for okay in orgs_match loop
+ insert into rhnUserServerGroupPerms(user_id, server_group_id)
+ values (user_id_in, server_group_id_in);
+ rhn_cache.update_perms_for_user(user_id_in);
+ return;
+ end loop;
+ rhn_exception.raise_exception('usgp_different_orgs');
+ exception when dup_val_on_index then
+ rhn_exception.raise_exception('usgp_already_allowed');
+ end add_servergroup_perm;
+
+ procedure remove_servergroup_perm(
+ user_id_in in number,
+ server_group_id_in in number
+ ) is
+ cursor perms is
+ select 1
+ from rhnUserServerGroupPerms
+ where user_id = user_id_in
+ and server_group_id = server_group_id_in;
+ begin
+ for perm in perms loop
+ delete from rhnUserServerGroupPerms
+ where user_id = user_id_in
+ and server_group_id = server_group_id_in;
+ rhn_cache.update_perms_for_user(user_id_in);
+ return;
+ end loop;
+ rhn_exception.raise_exception('usgp_not_allowed');
+ end remove_servergroup_perm;
+
+ procedure add_to_usergroup(
+ user_id_in in number,
+ user_group_id_in in number
+ ) is
+ cursor perm_granting_usergroups is
+ select user_group_id_in
+ from rhnUserGroup ug,
+ rhnUserGroupType ugt
+ where ugt.label in ('org_admin') -- and server_group_admin ?
+ and ug.id = user_group_id_in
+ and ug.group_type = ugt.id;
+ begin
+ insert into rhnUserGroupMembers(user_id, user_group_id)
+ values (user_id_in, user_group_id_in);
+
+ for ug in perm_granting_usergroups loop
+ rhn_cache.update_perms_for_user(user_id_in);
+ return;
+ end loop;
+ end add_to_usergroup;
+
+ procedure add_users_to_usergroups(
+ user_id_in in number
+ ) is
+ cursor ugms is
+ select element user_id,
+ element_two user_group_id
+ from rhnSet
+ where user_id = user_id_in
+ and label = 'user_group_list';
+ begin
+ for ugm in ugms loop
+ rhn_user.add_to_usergroup(ugm.user_id, ugm.user_group_id);
+ end loop;
+ end add_users_to_usergroups;
+
+ procedure remove_from_usergroup(
+ user_id_in in number,
+ user_group_id_in in number
+ ) is
+ cursor perm_granting_usergroups is
+ select label
+ from rhnUserGroupType ugt,
+ rhnUserGroupMembers ugm,
+ rhnUserGroup ug
+ where 1=1
+ and ug.id = user_group_id_in
+ and ugm.user_group_id = user_group_id_in
+ and ug.group_type = ugt.id
+ and ugm.user_id = user_id_in;
+ begin
+ -- we only do anything if you're really in the group, because
+ -- testing is significantly cheaper than rebuilding the user's
+ -- cache for no reason.
+ for ug in perm_granting_usergroups loop
+ delete from rhnUserGroupMembers
+ where user_id = user_id_in
+ and user_group_id = user_group_id_in;
+ if ug.label in ('org_admin') then
+ rhn_cache.update_perms_for_user(user_id_in);
+ end if;
+ end loop;
+ end remove_from_usergroup;
+
+end rhn_user;
+/
+SHOW ERRORS
commit 31cf9144f523e7ef70785b2b603829968b015758
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Dec 23 15:44:23 2010 +0100
RHN::UserActions not used anywhere, removing.
diff --git a/web/modules/rhn/MANIFEST b/web/modules/rhn/MANIFEST
index b15df6d..764293b 100644
--- a/web/modules/rhn/MANIFEST
+++ b/web/modules/rhn/MANIFEST
@@ -26,7 +26,6 @@ RHN/DB/Server.pm
RHN/DB/Server/StorageDevice.pm
RHN/DB/Set.pm
RHN/DB/TableClass.pm
-RHN/DB/UserActions.pm
RHN/DB/UserGroup.pm
RHN/DB/User.pm
RHN/Errata.pm
@@ -45,6 +44,5 @@ RHN/Server.pm
RHN/Session.pm
RHN/SessionSwap.pm
RHN/Set.pm
-RHN/UserActions.pm
RHN/UserGroup.pm
RHN/User.pm
diff --git a/web/modules/rhn/RHN/DB/UserActions.pm b/web/modules/rhn/RHN/DB/UserActions.pm
deleted file mode 100644
index dc8e5c1..0000000
--- a/web/modules/rhn/RHN/DB/UserActions.pm
+++ /dev/null
@@ -1,79 +0,0 @@
-#
-# Copyright (c) 2008--2010 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.
-#
-
-use strict;
-
-package RHN::DB::UserActions;
-
-use RHN::DB ();
-
-sub assign_set_to_group {
- my $class = shift;
- my $set = shift;
- my $ugid = shift;
- die "Invalid format for ugid $ugid" if $ugid =~ /\D/; # contain nondigit? die
-
- my $dbh = RHN::DB->connect();
-
- my $query = "delete from rhnSet where user_id = :user_id and label = :label";
- my $sth0 = $dbh->prepare($query);
- $sth0->execute_h(user_id=>$set->uid, label=>"user_group_list");
-
- my $sth1 = $dbh->prepare(<<EOQ);
-INSERT INTO rhnSet (user_id, label, element, element_two)
-SELECT :user_id, 'user_group_list', element, :ugid
- FROM rhnSet
- WHERE label = :label
- AND uid = :user_id
-MINUS
-SELECT :user_id, 'user_group_list', ugm.user_id, :ugid
- FROM rhnUserGroupMembers
- WHERE user_group_id = :ugid
-EOQ
- $sth1->execute_h(label=>$set->label, user_id=>$set->uid, ugid=>$ugid);
-
- $dbh->call_procedure("rhn_user.add_users_to_usergroups", $set->uid);
-
- $sth0->execute_h(user_id=>$set->uid, label=>"user_group_list");
- $dbh->commit;
-}
-
-sub remove_set_from_group {
- my $class = shift;
- my $set = shift;
- my $ugid = shift;
-
- my $dbh = RHN::DB->connect();
-
- my $query = "delete from rhnSet where user_id = :user_id and label = :label";
- my $sth0 = $dbh->prepare($query);
- $sth0->execute_h(user_id=>$set->uid, label=>"user_group_list");
-
- my $sth1 = $dbh->prepare(<<EOQ);
-INSERT INTO rhnSet (user_id, label, element, element_two)
-SELECT :user_id, 'user_group_list', element, :ugid
- FROM rhnSet
- WHERE label = :label
- AND user_id = :user_id
-EOQ
- $sth1->execute_h(label=>$set->label, user_id=>$set->uid, ugid=>$ugid);
-
- $dbh->call_procedure("rhn_user.remove_users_from_usergroups", $set->uid);
-
- $sth0->execute_h(user_id=>$set->id, label=>"user_group_list");
- $dbh->commit;
-}
-
-1;
diff --git a/web/modules/rhn/RHN/UserActions.pm b/web/modules/rhn/RHN/UserActions.pm
deleted file mode 100644
index 5046ff9..0000000
--- a/web/modules/rhn/RHN/UserActions.pm
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# Copyright (c) 2008 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.
-#
-
-use strict;
-
-package RHN::UserActions;
-use RHN::DB::UserActions;
-our @ISA = qw/RHN::DB::UserActions/;
-
-1;
diff --git a/web/modules/sniglets/Sniglets/Users.pm b/web/modules/sniglets/Sniglets/Users.pm
index 4253d7d..7a5668e 100644
--- a/web/modules/sniglets/Sniglets/Users.pm
+++ b/web/modules/sniglets/Sniglets/Users.pm
@@ -22,7 +22,6 @@ use PXT::Utils;
use RHN::User;
use RHN::Org;
use PXT::HTML;
-use RHN::UserActions;
use RHN::Mail;
use RHN::Postal;
use RHN::TemplateString;
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index 0f07d4f..77a7491 100644
--- a/web/spacewalk-web.spec
+++ b/web/spacewalk-web.spec
@@ -200,7 +200,6 @@ rm -rf $RPM_BUILD_ROOT
%{perl_vendorlib}/RHN/TinyURL.pm
%{perl_vendorlib}/RHN/Token.pm
%{perl_vendorlib}/RHN/User.pm
-%{perl_vendorlib}/RHN/UserActions.pm
%{perl_vendorlib}/RHN/Utils.pm
%{_mandir}/man3/RHN::ContactGroup.3pm.gz
%{_mandir}/man3/RHN::ContactMethod.3pm.gz
13 years, 4 months
Changes to 'refs/tags/spacewalk-setup-1.3.3-1'
by Jan Pazdziora
Tag 'spacewalk-setup-1.3.3-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2010-12-23 14:20 +0000
Tagging package [spacewalk-setup] version [1.3.3-1] in directory [spacewalk/setup/].
Changes since spacewalk-schema-1.3.7-1:
Jan Pazdziora (1):
Automatic commit of package [spacewalk-setup] release [1.3.3-1].
---
rel-eng/packages/spacewalk-setup | 2 +-
spacewalk/setup/spacewalk-setup.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
---
13 years, 4 months
rel-eng/packages spacewalk/setup
by Jan Pazdziora
rel-eng/packages/spacewalk-setup | 2 +-
spacewalk/setup/spacewalk-setup.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 27af9aeccb00ff33a27b9e8b6bbf015cf9606cb6
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Dec 23 15:20:09 2010 +0100
Automatic commit of package [spacewalk-setup] release [1.3.3-1].
diff --git a/rel-eng/packages/spacewalk-setup b/rel-eng/packages/spacewalk-setup
index 54a8201..2fcb832 100644
--- a/rel-eng/packages/spacewalk-setup
+++ b/rel-eng/packages/spacewalk-setup
@@ -1 +1 @@
-1.3.2-1 spacewalk/setup/
+1.3.3-1 spacewalk/setup/
diff --git a/spacewalk/setup/spacewalk-setup.spec b/spacewalk/setup/spacewalk-setup.spec
index 523a07c..2d11496 100644
--- a/spacewalk/setup/spacewalk-setup.spec
+++ b/spacewalk/setup/spacewalk-setup.spec
@@ -1,5 +1,5 @@
Name: spacewalk-setup
-Version: 1.3.2
+Version: 1.3.3
Release: 1%{?dist}
Summary: Initial setup tools for Red Hat Spacewalk
@@ -101,6 +101,9 @@ rm -rf %{buildroot}
%attr(755, apache, root) %{_var}/spacewalk
%changelog
+* Thu Dec 23 2010 Jan Pazdziora 1.3.3-1
+- The rhn_package package (schema in PostgreSQL) is now gone.
+
* Thu Dec 16 2010 Jan Pazdziora 1.3.2-1
- 636458 - check that the Oracle database instance is version 10 or 11.
13 years, 4 months