schema/spacewalk
by Jan Pazdziora
schema/spacewalk/common/views/views.deps | 1 -
1 file changed, 1 deletion(-)
New commits:
commit 16e91efb7117252f51da3ed1e69591d0a31545a0
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Dec 11 15:09:14 2009 +0100
View rhnUserAvailableUpgrades does not exist, removing dead deps.
diff --git a/schema/spacewalk/common/views/views.deps b/schema/spacewalk/common/views/views.deps
index d6e00be..c46261a 100644
--- a/schema/spacewalk/common/views/views.deps
+++ b/schema/spacewalk/common/views/views.deps
@@ -75,7 +75,6 @@ rhnServerOutdatedPackages :: rhnServerNeededPackageCache rhnErrata \
rhnStorageDevice :: rhnDevice
rhnUserAvailableChannels :: rhn_channel.pks rhnServerChannel \
rhnUserChannelTreeView rhnUserServerPerms
-rhnUserAvailableUpgrades :: rhnServerGroupType
rhnUserChannel :: rhn_channel.pks rhnChannelFamilyMembers \
rhnUserChannelFamilyPerms web_contact
rhnUserChannelTreeView :: rhnChannel rhnChannelFamilyMembers \
14 years, 5 months
schema/spacewalk
by Jan Pazdziora
schema/spacewalk/common/tables/tables.deps | 1 -
schema/spacewalk/common/views/views.deps | 8 +-------
schema/spacewalk/oracle/packages/packages.deps | 12 ++++++------
schema/spacewalk/postgres/packages/packages.deps | 12 ++++++------
4 files changed, 13 insertions(+), 20 deletions(-)
New commits:
commit 14fb5950f104fb32a5101939da5b34f6be6bb2b5
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Dec 11 15:07:33 2009 +0100
Nothing named rhnService* does seem to exist, removing dead deps.
diff --git a/schema/spacewalk/common/tables/tables.deps b/schema/spacewalk/common/tables/tables.deps
index c677e9c..5300439 100644
--- a/schema/spacewalk/common/tables/tables.deps
+++ b/schema/spacewalk/common/tables/tables.deps
@@ -208,7 +208,6 @@ rhnServerProfile :: web_customer rhnChannel rhnServerProfileType
rhnServerProfilePackage :: rhnServerProfile rhnPackageName rhnPackageEVR
rhnServerTokenRegs :: rhnRegToken rhnServer
rhnServerServerGroupArchCompat :: rhnServerGroupType rhnServerArch
-rhnServiceServerGroupMap :: rhnServerGroupType
rhnSet :: web_contact
rhnSGTypeBaseAddonCompat :: rhnServerGroupType
rhnSGTypeVirtSubLevel :: rhnServerGroupType rhnVirtSubLevel
diff --git a/schema/spacewalk/common/views/views.deps b/schema/spacewalk/common/views/views.deps
index 5cf21c0..d6e00be 100644
--- a/schema/spacewalk/common/views/views.deps
+++ b/schema/spacewalk/common/views/views.deps
@@ -72,16 +72,10 @@ rhnServerGroupOVLiteHelper :: rhnServerNeededPackageCache rhnErrata \
rhnServerErrataTypeView :: rhnServerNeededErrataCache
rhnServerOutdatedPackages :: rhnServerNeededPackageCache rhnErrata \
rhnPackageName rhnPackageEVR rhnPackage
-rhnServiceLineChannelView :: rhnServiceChannelFamilyMap
-rhnServiceLineServerGroup :: rhnServerGroupType rhnServiceServerGroupMap
-rhnServiceLineUserGroup :: rhnUserGroupType rhnServiceUserGroupMap
-rhnServices :: rhnServiceChannelFamilyMap \
- rhnServiceServerGroupMap \
- rhnServiceUserGroupMap
rhnStorageDevice :: rhnDevice
rhnUserAvailableChannels :: rhn_channel.pks rhnServerChannel \
rhnUserChannelTreeView rhnUserServerPerms
-rhnUserAvailableUpgrades :: rhnServiceServerGroupMap rhnServerGroupType
+rhnUserAvailableUpgrades :: rhnServerGroupType
rhnUserChannel :: rhn_channel.pks rhnChannelFamilyMembers \
rhnUserChannelFamilyPerms web_contact
rhnUserChannelTreeView :: rhnChannel rhnChannelFamilyMembers \
diff --git a/schema/spacewalk/oracle/packages/packages.deps b/schema/spacewalk/oracle/packages/packages.deps
index 9361cab..9c36e7b 100644
--- a/schema/spacewalk/oracle/packages/packages.deps
+++ b/schema/spacewalk/oracle/packages/packages.deps
@@ -53,12 +53,12 @@ rhn_external_api.pkb :: web_contact xxrh_eproxy_api
rhn_ep.pkb :: rhn_bel.pks rhn_channel.pks rhn_entitlements.pks rhn_exception.pks \
rhn_quota web_contact web_customer \
web_user_order web_user_order_line \
- rhnServiceServerGroupMap rhnServerGroupType \
- rhnServiceUserGroupMap rhnUserGroupType \
- rhnChannelFamily rhnServiceChannelFamilyMap \
- rhnUserGroup rhnServiceLineUserGroups \
- rhnServerGroup rhnServiceLineServerGroups \
- rhnPrivateChannelFamily rhnServiceLineChannelView \
+ rhnServerGroupType \
+ rhnUserGroupType \
+ rhnChannelFamily \
+ rhnUserGroup \
+ rhnServerGroup \
+ rhnPrivateChannelFamily \
rhnDaemonState rhnChannelFamilyMembers \
rhnEntitlementQueue
rhn_org.pkb :: rhn_entitlements.pks \
diff --git a/schema/spacewalk/postgres/packages/packages.deps b/schema/spacewalk/postgres/packages/packages.deps
index f95aa19..071eae6 100644
--- a/schema/spacewalk/postgres/packages/packages.deps
+++ b/schema/spacewalk/postgres/packages/packages.deps
@@ -52,12 +52,12 @@ rhn_external_api.pkb :: web_contact xxrh_eproxy_api
rhn_ep.pkb :: rhn_bel.pks rhn_channel.pks rhn_entitlements.pks rhn_exception.pks \
rhn_quota web_contact web_customer \
web_user_order web_user_order_line \
- rhnServiceServerGroupMap rhnServerGroupType \
- rhnServiceUserGroupMap rhnUserGroupType \
- rhnChannelFamily rhnServiceChannelFamilyMap \
- rhnUserGroup rhnServiceLineUserGroups \
- rhnServerGroup rhnServiceLineServerGroups \
- rhnPrivateChannelFamily rhnServiceLineChannelView \
+ rhnServerGroupType \
+ rhnUserGroupType \
+ rhnChannelFamily \
+ rhnUserGroup \
+ rhnServerGroup \
+ rhnPrivateChannelFamily \
rhnDaemonState rhnChannelFamilyMembers \
rhnEntitlementQueue
rhn_org.pkb :: rhn_entitlements.pks \
14 years, 5 months
3 commits - schema/spacewalk
by Jan Pazdziora
schema/spacewalk/common/tables/tables.deps | 3 +--
schema/spacewalk/common/views/views.deps | 15 +--------------
schema/spacewalk/oracle/packages/packages.deps | 4 ++--
schema/spacewalk/postgres/packages/packages.deps | 4 ++--
4 files changed, 6 insertions(+), 20 deletions(-)
New commits:
commit a4244d09d6a0e9b0c6b6d1d499d7e76caac4cbe1
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Dec 11 15:01:31 2009 +0100
View rhnFreeErrataMail does not exist in Spacewalk 0.7, removing deads deps.
diff --git a/schema/spacewalk/common/views/views.deps b/schema/spacewalk/common/views/views.deps
index a8e10c6..5cf21c0 100644
--- a/schema/spacewalk/common/views/views.deps
+++ b/schema/spacewalk/common/views/views.deps
@@ -50,14 +50,6 @@ rhnChecksumView :: rhnChecksum rhnChecksumType
rhnDemoOrgs :: demo_log
rhnEntitledServers :: rhnServerGroup rhnServerGroupType \
rhnServerGroupMembers rhnServer
-rhnFreeErrataMail :: rhnChannelErrata rhnServerChannel \
- rhnServerGroupMembers rhnServerGroup \
- rhnServer web_contact rhnErrata \
- web_user_personal_info rhnUserInfo \
- rhnErrata rhnServerArch rhnUserServerPrefs \
- rhnUserGroupType rhnUserGroup \
- rhnUserGroupMembers rhnServerGroupMembers \
- rhnUserServerGroupPerms
rhnHWDevice :: rhnDevice
rhnOrgChannelTreeView :: rhnChannel rhnChannelFamilyMembers \
rhnOrgChannelFamilyPermissions
@@ -66,7 +58,7 @@ rhnOrgPackageOverview :: rhnPackageName rhnPackageEVR rhnPackageArch
rhnChannelPackageArchCompat rhnPackage \
rhn_package.pks
rhnPaidOrgs :: rhnDemoOrgs rhnServerGroup
-rhnPrivateErrataMail :: rhnFreeErrataMail rhnServerPackage \
+rhnPrivateErrataMail :: rhnServerPackage \
rhnWebContactDisabled
rhnServerEntitledView :: rhnServerGroupType rhnServerGroup \
rhnServerGroupMembers
commit 4736cb9fb5a371e2b6dfc4ad8efa4f6c66642e59
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Dec 11 14:57:22 2009 +0100
View rhnExpiringTrialMail does not exist in Spacewalk 0.7, removing deads deps.
diff --git a/schema/spacewalk/common/views/views.deps b/schema/spacewalk/common/views/views.deps
index b36c790..a8e10c6 100644
--- a/schema/spacewalk/common/views/views.deps
+++ b/schema/spacewalk/common/views/views.deps
@@ -50,11 +50,6 @@ rhnChecksumView :: rhnChecksum rhnChecksumType
rhnDemoOrgs :: demo_log
rhnEntitledServers :: rhnServerGroup rhnServerGroupType \
rhnServerGroupMembers rhnServer
-rhnExpiringTrialMail :: rhnServerGroupType \
- web_user_site_info web_user_personal_info \
- web_user_contact_permission web_contact \
- rhnUserGroupMembers rhnUserGroup \
- rhnServiceServerGroupMap
rhnFreeErrataMail :: rhnChannelErrata rhnServerChannel \
rhnServerGroupMembers rhnServerGroup \
rhnServer web_contact rhnErrata \
commit 28767410ca88feb100d35d4e5660dfc189657875
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Dec 11 14:55:24 2009 +0100
Table rh_product does not exist in Spacewalk 0.7, removing deads deps.
diff --git a/schema/spacewalk/common/tables/tables.deps b/schema/spacewalk/common/tables/tables.deps
index a53bccc..c677e9c 100644
--- a/schema/spacewalk/common/tables/tables.deps
+++ b/schema/spacewalk/common/tables/tables.deps
@@ -208,8 +208,7 @@ rhnServerProfile :: web_customer rhnChannel rhnServerProfileType
rhnServerProfilePackage :: rhnServerProfile rhnPackageName rhnPackageEVR
rhnServerTokenRegs :: rhnRegToken rhnServer
rhnServerServerGroupArchCompat :: rhnServerGroupType rhnServerArch
-rhnServiceChannelFamilyMap :: rh_product
-rhnServiceServerGroupMap :: rh_product rhnServerGroupType
+rhnServiceServerGroupMap :: rhnServerGroupType
rhnSet :: web_contact
rhnSGTypeBaseAddonCompat :: rhnServerGroupType
rhnSGTypeVirtSubLevel :: rhnServerGroupType rhnVirtSubLevel
diff --git a/schema/spacewalk/common/views/views.deps b/schema/spacewalk/common/views/views.deps
index 46f2da0..b36c790 100644
--- a/schema/spacewalk/common/views/views.deps
+++ b/schema/spacewalk/common/views/views.deps
@@ -50,7 +50,7 @@ rhnChecksumView :: rhnChecksum rhnChecksumType
rhnDemoOrgs :: demo_log
rhnEntitledServers :: rhnServerGroup rhnServerGroupType \
rhnServerGroupMembers rhnServer
-rhnExpiringTrialMail :: rhnServerGroupType rh_product \
+rhnExpiringTrialMail :: rhnServerGroupType \
web_user_site_info web_user_personal_info \
web_user_contact_permission web_contact \
rhnUserGroupMembers rhnUserGroup \
diff --git a/schema/spacewalk/oracle/packages/packages.deps b/schema/spacewalk/oracle/packages/packages.deps
index ed1e5e5..9361cab 100644
--- a/schema/spacewalk/oracle/packages/packages.deps
+++ b/schema/spacewalk/oracle/packages/packages.deps
@@ -49,9 +49,9 @@ rhn_entitlements.pkb :: rhnServerGroupType rhnServerGroup rhnServerGroupMembe
rhn_entitlements.pks :: rhnServerGroupType
rhn_exception.pkb :: rhnException
rhn_exception.pks :: rhnException
-rhn_external_api.pkb :: rh_product web_contact xxrh_eproxy_api
+rhn_external_api.pkb :: web_contact xxrh_eproxy_api
rhn_ep.pkb :: rhn_bel.pks rhn_channel.pks rhn_entitlements.pks rhn_exception.pks \
- rhn_quota web_contact web_customer rh_product \
+ rhn_quota web_contact web_customer \
web_user_order web_user_order_line \
rhnServiceServerGroupMap rhnServerGroupType \
rhnServiceUserGroupMap rhnUserGroupType \
diff --git a/schema/spacewalk/postgres/packages/packages.deps b/schema/spacewalk/postgres/packages/packages.deps
index 8b32a1a..f95aa19 100644
--- a/schema/spacewalk/postgres/packages/packages.deps
+++ b/schema/spacewalk/postgres/packages/packages.deps
@@ -48,9 +48,9 @@ rhn_entitlements.pkb :: rhnServerGroupType rhnServerGroup rhnServerGroupMembe
rhn_entitlements.pks :: rhnServerGroupType
rhn_exception.pkb :: rhnException
rhn_exception.pks :: rhnException
-rhn_external_api.pkb :: rh_product web_contact xxrh_eproxy_api
+rhn_external_api.pkb :: web_contact xxrh_eproxy_api
rhn_ep.pkb :: rhn_bel.pks rhn_channel.pks rhn_entitlements.pks rhn_exception.pks \
- rhn_quota web_contact web_customer rh_product \
+ rhn_quota web_contact web_customer \
web_user_order web_user_order_line \
rhnServiceServerGroupMap rhnServerGroupType \
rhnServiceUserGroupMap rhnUserGroupType \
14 years, 5 months
8 commits - web/modules
by Jan Pazdziora
web/modules/rhn/RHN/DB/Channel.pm | 62 -----------
web/modules/rhn/RHN/DB/Org.pm | 60 -----------
web/modules/rhn/RHN/DB/Server.pm | 58 ----------
web/modules/sniglets/Sniglets/Org.pm | 189 -----------------------------------
4 files changed, 369 deletions(-)
New commits:
commit 2a0bc3f80725fe3706c85291b5700a0645b59eb4
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Dec 11 14:51:49 2009 +0100
Previous change made satellite_channels_by_version obsolete, removing as dead code; throw the %sat_chans_by_version in (out) as well.
diff --git a/web/modules/rhn/RHN/DB/Channel.pm b/web/modules/rhn/RHN/DB/Channel.pm
index 4676ae8..65d11ba 100644
--- a/web/modules/rhn/RHN/DB/Channel.pm
+++ b/web/modules/rhn/RHN/DB/Channel.pm
@@ -289,42 +289,6 @@ sub trusted_orgs {
# Channel package functions
################################
-my %sat_chans_by_version = ('1.0' => ['redhat-rhn-satellite-as-i386-2.1', 'redhat-rhn-satellite-i386-7.2'],
- '2.0' => ['redhat-rhn-satellite-2.0-as-i386-2.1', 'redhat-rhn-satellite-2.0-i386-7.2'],
- '2.1' => ['redhat-rhn-satellite-2.1-as-i386-2.1'],
- '2.99' => ['redhat-rhn-satellite-2.99beta-as-i386-2.1'],
- '3.2' => ['redhat-rhn-satellite-3.2-as-i386-2.1'],
- '3.4' => ['redhat-rhn-satellite-3.4-as-i386-2.1'],
- '3.5' => ['redhat-rhn-satellite-3.5-as-i386-2.1', 'redhat-rhn-satellite-3.5-as-i386-3'],
- '3.6' => ['redhat-rhn-satellite-3.6-as-i386-2.1', 'redhat-rhn-satellite-3.6-as-i386-3'],
- '3.7' => ['redhat-rhn-satellite-3.7-as-i386-2.1', 'redhat-rhn-satellite-3.7-as-i386-3',
- 'redhat-rhn-satellite-3.7-as-i386-4'],
- '4.0' => ['redhat-rhn-satellite-4.0-as-x86_64-4',
- 'redhat-rhn-satellite-4.0-as-i386-3',
- 'redhat-rhn-satellite-4.0-as-i386-4',
- ],
- '4.1' => ['redhat-rhn-satellite-4.1-as-i386-3',
- 'redhat-rhn-satellite-4.1-as-i386-4',
- ],
- '4.2' => ['redhat-rhn-satellite-4.2-as-i386-3',
- 'redhat-rhn-satellite-4.2-as-i386-4',
- ],
- '5.0' => ['redhat-rhn-satellite-5.0-as-i386-4',
- 'redhat-rhn-satellite-5.0-server-i386-5',
- ],
- );
-
-sub satellite_channels_by_version {
- my $class = shift;
- my %params = validate(@_, { version => {type => Params::Validate::SCALAR } });
-
- if (not exists $sat_chans_by_version{$params{version}}) {
- die "invalid satellite version";
- }
-
- return @{$sat_chans_by_version{$params{version}}};
-}
-
my %proxy_chans_by_version = ('1.1' => ['redhat-rhn-proxy-as-i386-2.1', 'redhat-rhn-proxy-i386-7.2'],
'3.2' => ['redhat-rhn-proxy-3.2-as-i386-2.1'],
'3.6' => ['redhat-rhn-proxy-3.6-as-i386-2.1', 'redhat-rhn-proxy-3.6-as-i386-3'],
commit fe222cd8d0740209b726c8ff088c222eef739b52
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Dec 11 14:50:27 2009 +0100
Previous change made satellite_channel_versions obsolete, removing as dead code.
diff --git a/web/modules/rhn/RHN/DB/Channel.pm b/web/modules/rhn/RHN/DB/Channel.pm
index da58a90..4676ae8 100644
--- a/web/modules/rhn/RHN/DB/Channel.pm
+++ b/web/modules/rhn/RHN/DB/Channel.pm
@@ -314,11 +314,6 @@ my %sat_chans_by_version = ('1.0' => ['redhat-rhn-satellite-as-i386-2.1', 'redha
],
);
-sub satellite_channel_versions {
- my $class = shift;
- return sort(keys %sat_chans_by_version);
-}
-
sub satellite_channels_by_version {
my $class = shift;
my %params = validate(@_, { version => {type => Params::Validate::SCALAR } });
commit a355c5b5278158bc636f1695a8543f2d911ae39c
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Dec 11 14:49:21 2009 +0100
sat_channel_by_version not used anywyere, removing as dead code.
diff --git a/web/modules/rhn/RHN/DB/Server.pm b/web/modules/rhn/RHN/DB/Server.pm
index b73d96a..1776956 100644
--- a/web/modules/rhn/RHN/DB/Server.pm
+++ b/web/modules/rhn/RHN/DB/Server.pm
@@ -755,44 +755,6 @@ EOQ
-# given a base channel id plus satellite certificate satellite-version value,
-# return satellite channel info...
-sub sat_channel_by_version {
- my $self = shift;
- my %params = validate(@_, { version => { type => Params::Validate::SCALAR } });
-
- my @potential_chans = RHN::Channel->satellite_channels_by_version(-version => $params{version});
-
- return unless @potential_chans;
-
- my $num_potentials = scalar @potential_chans;
-
- my $base_channel_id = $self->base_channel_id;
- die "no base channel!?" unless $base_channel_id;
-
- my $query = sprintf(<<EOQ, join(", ", map {":chan$_"} (1..$num_potentials)));
-SELECT DISTINCT C.id AS CHANNEL_ID, C.label AS CHANNEL_LABEL
- FROM rhnChannel C
- WHERE C.label IN (%s)
- AND C.parent_channel = :base_channel_id
-EOQ
-
- my $dbh = RHN::DB->connect;
- my $sth = $dbh->prepare($query);
-
- my %args = (base_channel_id => $base_channel_id);
- foreach my $placeholder (map {"chan$_"} (1..$num_potentials)) {
- $args{$placeholder} = pop @potential_chans;
- }
-
- $sth->execute_h(%args);
-
- my $sat_channel_info = $sth->fetchrow_hashref;
- $sth->finish;
-
- return $sat_channel_info;
-}
-
sub deactivate_proxy {
my $self = shift;
my $transaction = shift;
commit 9efbf02a1b96b1a25d5ddb7135ad90b2cbd6e962
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Dec 11 14:46:45 2009 +0100
Previous change made family_details_by_label obsolete, removing as dead code.
diff --git a/web/modules/rhn/RHN/DB/Channel.pm b/web/modules/rhn/RHN/DB/Channel.pm
index 5edfcad..da58a90 100644
--- a/web/modules/rhn/RHN/DB/Channel.pm
+++ b/web/modules/rhn/RHN/DB/Channel.pm
@@ -1350,27 +1350,6 @@ EOQ
return $row;
}
-sub family_details_by_label {
- my $class = shift;
- my $label = shift;
-
- die "No channel family label" unless defined $label;
-
- my $dbh = RHN::DB->connect;
- my $sth = $dbh->prepare(<<EOQ);
-SELECT CF.id, CF.name, CF.label, CF.product_url, CF.org_id
- FROM rhnChannelFamily CF
- WHERE CF.label = :label
-EOQ
-
- $sth->execute_h(label => $label);
- my ($row) = $sth->fetchrow_hashref;
-
- $sth->finish;
-
- return $row;
-}
-
sub family_details_from_set {
commit d13864e6cb1f9af96f87fa9d2acb87dd55017c6a
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Dec 11 14:45:19 2009 +0100
Previous change made server_group_type_ids_by_label obsolete, removing as dead code.
diff --git a/web/modules/rhn/RHN/DB/Server.pm b/web/modules/rhn/RHN/DB/Server.pm
index 03b6dc7..b73d96a 100644
--- a/web/modules/rhn/RHN/DB/Server.pm
+++ b/web/modules/rhn/RHN/DB/Server.pm
@@ -3896,26 +3896,6 @@ EOQ
return $row;
}
-sub server_group_type_ids_by_label {
- my $class = shift;
-
- my $dbh = RHN::DB->connect;
- my $sth = $dbh->prepare(<<EOQ);
-SELECT label, id
- FROM rhnServerGroupType
-EOQ
-
-
- $sth->execute();
-
- my $ret;
- while (my $row = $sth->fetchrow_hashref) {
- $ret->{$row->{LABEL}} = $row->{ID};
- }
-
- return $ret;
-}
-
sub server_group_type_details_from_set {
my $class = shift;
my $uid = shift;
commit 119b6fdf1252034653a4a06b4910f20fc766ab8f
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Dec 11 14:43:42 2009 +0100
calc_cert_expiration not used anywyere, removing as dead code.
diff --git a/web/modules/rhn/RHN/DB/Org.pm b/web/modules/rhn/RHN/DB/Org.pm
index 3431c3c..c68d4e5 100644
--- a/web/modules/rhn/RHN/DB/Org.pm
+++ b/web/modules/rhn/RHN/DB/Org.pm
@@ -1399,32 +1399,6 @@ EOQ
}
-# figure out the theoretical expiration date of an org's cert given
-# the currently available services
-sub calc_cert_expiration {
- my $self = shift;
-
- my $dbh = RHN::DB->connect;
- my $sth = $dbh->prepare(<<EOQ);
-SELECT GREATEST(end_date_active) FROM web_customer_entitlements
- WHERE service_item_code IN
- (SELECT item_code FROM rh_product
- WHERE product_id IN
- (SELECT product_id FROM rhnServiceChannelFamilyMap
- WHERE family_id IN
- (SELECT id FROM rhnChannelFamily WHERE label='rhn-satellite'))) AND
- active_flag='Y' AND customer_id=:org_id
-EOQ
-
- $sth->execute_h(org_id => $self->id);
- my $data = $sth->fetchrow;
-
- $sth->finish;
-
- return Date::Parse::str2time($data);
-
-}
-
sub available_cert_channels {
my $self = shift;
commit a6ffecc8779f0b74118f629c50ab85b901f2508a
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Dec 11 14:42:54 2009 +0100
lookup_company_name not used anywyere, removing as dead code.
diff --git a/web/modules/rhn/RHN/DB/Org.pm b/web/modules/rhn/RHN/DB/Org.pm
index 4a5a722..3431c3c 100644
--- a/web/modules/rhn/RHN/DB/Org.pm
+++ b/web/modules/rhn/RHN/DB/Org.pm
@@ -129,40 +129,6 @@ EOQ
return $ret;
}
-sub lookup_company_name {
-
- my $self = shift;
- my $org_id = shift;
- my $dbh = RHN::DB->connect;
-
- my $sth = $dbh->prepare (<<EOQ);
-select
- nvl(wupi.company,(select name from web_customer where id = :org_id))
-from
- web_user_personal_info wupi,
- web_contact wcon
-where
- wcon.org_id = :org_id
- and wupi.web_user_id = wcon.id
- and wupi.modified = (
- select max(wupi.modified)
- from
- web_user_personal_info wupi,
- web_contact wcon
- where
- wcon.org_id = :org_id
- and wupi.web_user_id = wcon.id
- )
-EOQ
-
- $sth->execute_h(org_id => $org_id);
- my $org_name = $sth->fetchrow();
- $sth->finish();
-
- return $org_name;
-
-}
-
my @valid_org_entitlements = qw/sw_mgr_personal sw_mgr_enterprise rhn_provisioning rhn_nonlinux rhn_monitor rhn_solaris/;
commit f592ca8226e95b03d0fa1b5e89fcfd54138c4a32
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Dec 11 14:38:38 2009 +0100
rhn-cert-info not used anywhere, makes cert_info obsolete as well, removing.
diff --git a/web/modules/sniglets/Sniglets/Org.pm b/web/modules/sniglets/Sniglets/Org.pm
index 7809985..3899185 100644
--- a/web/modules/sniglets/Sniglets/Org.pm
+++ b/web/modules/sniglets/Sniglets/Org.pm
@@ -30,7 +30,6 @@ sub register_tags {
my $class = shift;
my $pxt = shift;
- $pxt->register_tag('rhn-cert-info' => \&cert_info);
$pxt->register_tag('rhn-cert-text' => \&cert_text);
$pxt->register_tag('rhn-org-entitlement-name' => \&org_entitlement_name, -5);
}
@@ -77,194 +76,6 @@ sub reset_and_commit_set {
$set->commit();
}
-sub cert_info {
-
- my $pxt = shift;
- my %params = @_;
- my $block = $params{__block__};
-
- my $support_org_id = $pxt->param('support_org_id');
- if (not $support_org_id) {
- reset_form($pxt);
- croak "No org id provided!";
- }
-
- my $org = RHN::Org->lookup(-id => $support_org_id);
-
- my $data = $pxt->session->get('new_cert_info');
-
- my %cert_info;
-
- # use the data we've got in the session if it's there
- if ($data and $data->{'meta_info'}->{'support_org_id'} eq $org->id) {
-
- %cert_info = %{$data};
-
- # overwrite the cert owner name with the correct name from web_user_personal_info
- $cert_info{'meta_info'}->{'owner'} = RHN::Org->lookup_company_name($support_org_id);
-
- }
- else {
- reset_form($pxt); # blank slate
-
- # initialize our vars from the db
- $cert_info{'meta_info'}->{'support_org_id'} = $org->id;
-
- # set the cert owner name with the correct name from web_user_personal_info
- $cert_info{'meta_info'}->{'owner'} = RHN::Org->lookup_company_name($support_org_id);
-
- # grab the latest version
- my @versions = RHN::Channel->satellite_channel_versions;
- my $ver = pop @versions;
- $cert_info{'meta_info'}->{'version'} = $ver;
- $cert_info{'meta_info'}->{'issued'} = HTTP::Date::time2str(time());
- $cert_info{'meta_info'}->{'expires'} = HTTP::Date::time2str($org->calc_cert_expiration);
-
- # services
- my $ent_data = $org->entitlement_data;
- my @ent_keys = keys %{$ent_data};
-
- my $service_set = RHN::Set->lookup(-label => 'new_cert_service_set', -uid => $pxt->user->id);
- my $service_id_map_ref = RHN::Server->server_group_type_ids_by_label();
-
- my $prov_quant = 0;
- foreach my $ent (sort @ent_keys) {
- if ($ent ne 'sw_mgr_entitled') {
- my $total = $ent_data->{$ent}->{max};
- $service_set->add( [ $service_id_map_ref->{$ent}, $total] );
- if ($ent eq 'provisioning_entitled') {
- $prov_quant = $total;
- }
- }
- }
- $service_set->commit();
-
- # channels
- my $rec;
- my %channel_quantities;
- my $channel_set = RHN::Set->lookup(-label => 'new_cert_channel_set', -uid => $pxt->user->id);
- my $rhn_slots_id = 0;
- foreach $rec ($org->ent_cert_channels) {
- my ($cid, $name, $label, $quant) = @$rec;
- if ($quant and $quant > 0) {
- $channel_set->add([$cid, $quant]);
- }
- }
-
- # always make sure that rhn-tools is among the channel families.
- # quantity for rhn-tools is always the same # as provisioning
- # entitlements.
- my $rhn_tools = RHN::Channel->family_details_by_label('rhn-tools');
- my $additional_channel_set = RHN::Set->lookup(-label => 'new_cert_add_channel_set', -uid => $pxt->user->id);
- my %contents = $channel_set->output_hash;
- if ( exists $contents{$rhn_tools->{ID}} ) {
- $channel_set->add([$rhn_tools->{ID}, $prov_quant]);
- }
- else {
- $additional_channel_set->add([$rhn_tools->{ID}, $prov_quant]);
- }
- $channel_set->commit();
- $additional_channel_set->commit();
-
- $pxt->session->set('new_cert_info', \%cert_info);
- }
-
- # do our substitutions
- my %subs;
-
- $subs{'support_org_id'} = $cert_info{'meta_info'}->{'support_org_id'};
- $subs{'owner'} = $cert_info{'meta_info'}->{'owner'};
-
- my @possible_versions;
- foreach my $ver (RHN::Channel->satellite_channel_versions) {
- push @possible_versions, [ $ver, $ver, $ver eq $cert_info{'meta_info'}->{'version'} ? 1 : 0];
- }
- $subs{'version'} = PXT::HTML->select(-name => "version",
- -options => \@possible_versions);
-
- $subs{'issued'} = $cert_info{'meta_info'}->{'issued'};
- $subs{'expires'} = $cert_info{'meta_info'}->{'expires'};
-
- my $counter = 1;
-
- my $services = get_service_map($pxt->user->id);
- my $servicetable = "";
-
- foreach my $label (sort keys %{$services}) {
- $counter++;
- my $total = $services->{$label}->{QUANT};
- my $id = $services->{$label}->{ID};
- my $row_class = ($counter % 2) ? "list-row-even" : "list-row-odd";
- $servicetable .= "<tr class=\"" . $row_class . "\">\n";
- $servicetable .= " <td>" . $label . "</td>\n";
- $servicetable .= " <td align=\"center\">" . $total . "</td>\n";
- $servicetable .= " <td align=\"center\">\n";
- $servicetable .= " <input size=\"5\" type=\"text\" name=\"service_" . $id . "_quant\" value=\"" . $total . "\"/>\n";
- $servicetable .= " <input type=\"hidden\" name=\"service\" value=\"" . $id . "\"/>\n";
- $servicetable .= " <input type=\"hidden\" name=\"service_" . $id . "_oldquant\" value=\"" . $total . "\"/>\n";
- $servicetable .= " </td>\n";
- $servicetable .= "</tr>\n";
- }
- $subs{services} = $servicetable;
-
-
- my $existing_channels = get_channel_family_map($pxt->user->id, 'new_cert_channel_set');
- $subs{channels} = render_channel_rows($existing_channels, "chanid", 1);
-
- my $additional_channels = get_channel_family_map($pxt->user->id, 'new_cert_add_channel_set');
- my $addchantable = "";
-
- $addchantable = "<tr><td colspan=\"3\" align=\"center\">none</td></tr>" unless
- ($pxt->dirty_param('add_channel') or keys %{$additional_channels});
-
- $addchantable .= render_channel_rows($additional_channels, "addchanid", 0);
-
- # add row for entering channel manually
- if ($pxt->dirty_param('add_channel')) {
- my $add_channel_id = $pxt->dirty_param('add_channel_id');
- if( not $add_channel_id ) {
- $add_channel_id = "";
- }
-
- # we create an option list of available channels,
- # but we don't want to list the ones already
- # entitled or manually added
- my %skip_chan = ();
- for (keys %{$existing_channels}) {
- $skip_chan{$_} = 1;
- }
- for (keys %{$additional_channels}) {
- $skip_chan{$_} = 1;
- }
-
- my @possible_channels;
-
- foreach my $rec ($org->available_cert_channels) {
- my ($id, $name, $label) = @$rec;
- if (not $skip_chan{$label}) {
- push @possible_channels,
- [ $label , $id, $id eq $add_channel_id ? 1 : 0 ];
- }
- }
-
- my @chankeys = keys %{$additional_channels};
- my $row_class = (($#chankeys + 1) % 2) ? "list-row-even" : "list-row-odd";
- $addchantable .= "<tr class=\"" . $row_class . "\"><td>";
- $addchantable .= PXT::HTML->select(-name => "newchannel",
- -options => \@possible_channels);
-
- $addchantable .= " </td><td align=\"center\">0</td><td align=\"center\">";
- $addchantable .= "<input size=\"5\" type=\"text\" name=\"newchannel_quant\" value=\"0\"/>\n";
- $addchantable .= "</td></tr>\n";
- }
-
- $subs{additional_channels} = $addchantable;
-
- $block = PXT::Utils->perform_substitutions($block, \%subs);
- return $block;
-
-}
-
sub get_channel_family_map {
my $uid = shift;
my $set_label = shift;
14 years, 5 months
web/modules
by Jan Pazdziora
web/modules/rhn/RHN/Catalog.pm | 130 ------------------
web/modules/sniglets/Sniglets/ListView/GeneralList.pm | 1
2 files changed, 131 deletions(-)
New commits:
commit 610f1cf2184ac4a92d478f967a49a3023a52245d
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Dec 11 14:31:22 2009 +0100
Previous cleanup made RHN::Catalog unused, removing as dead code.
diff --git a/web/modules/rhn/RHN/Catalog.pm b/web/modules/rhn/RHN/Catalog.pm
deleted file mode 100644
index c909f9e..0000000
--- a/web/modules/rhn/RHN/Catalog.pm
+++ /dev/null
@@ -1,130 +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::Catalog;
-
-use RHN::DB;
-use Carp qw/confess cluck/;
-
-
-my %product_data;
-my %product_aliases =
- ( prod_basic => "SER0129",
- prod_enterprise => "SVC0060",
-
- prod_wsbasic => "SVC0056",
- prod_esbasic => "SVC0057",
- prod_wsbasic_mgmt => "SVC0058",
- prod_esbasic_mgmt => "SVC0059",
-
- prod_prov => 'SVC0081',
- prod_prov_upgrade => 'SVC0082',
-
-# prod_ent5pack => "RHN035",
-# prod_ent10pack => "RHN036",
- );
-my @sellable_slots = keys %product_aliases;
-
-sub sellable_slots {
- my $class = shift;
-
- return @sellable_slots;
-}
-
-# handy function to a) load cache, b) verify given product alias is in it
-sub prep_check {
- my $class = shift;
- my $alias = shift;
-
- if (not keys %product_data) {
- $class->load_products;
- }
-
- die "no product data for product $alias" unless exists $product_data{$alias};
-}
-
-sub product_code_by_alias {
- my $class = shift;
- my $alias = shift;
-
- $class->prep_check($alias);
- return $product_data{$alias}->{ITEM_CODE};
-}
-
-sub product_short_name {
- my $class = shift;
- my $alias = shift;
-
- $class->prep_check($alias);
- return $product_data{$alias}->{NAME};
-}
-
-sub product_price_by_alias {
- my $class = shift;
- my $alias = shift;
-
- $class->prep_check($alias);
- return $product_data{$alias}->{PRICE};
-}
-
-# everything is a service... for now
-sub product_tax_type {
- return 'S';
-}
-
-sub valid_alias {
- my $class = shift;
- my $alias = shift;
-
- $class->prep_check($alias);
- return exists $product_data{$alias};
-}
-
-sub is_provisioning_upgrade_product {
- my $class = shift;
- my $item_code = shift;
-
- return $product_aliases{prod_prov_upgrade} eq $item_code;
-}
-
-sub lookup_product_by_alias {
- my $class = shift;
- my $alias = shift;
-
- $class->prep_check($alias);
- return RHN::Product->lookup(-item_code => $product_data{$alias}->{ITEM_CODE});
-}
-
-sub load_products {
- my $class = shift;
-
- my $dbh = RHN::DB->connect;
- my $sth = $dbh->prepare("SELECT :item ALIAS, product_id, item_code, name, price FROM rh_product WHERE item_code = :item");
-
- for my $alias ($class->sellable_slots) {
- $sth->execute_h(item => $product_aliases{$alias});
-
- my $product = $sth->fetchrow_hashref;
- $sth->finish;
-
- confess "can't find product data for $alias/$product_aliases{$alias}" unless $product;
-
- $product_data{$alias} = $product;
- }
-}
-
-1;
-
diff --git a/web/modules/sniglets/Sniglets/ListView/GeneralList.pm b/web/modules/sniglets/Sniglets/ListView/GeneralList.pm
index a3e01e4..3ca6ff9 100644
--- a/web/modules/sniglets/Sniglets/ListView/GeneralList.pm
+++ b/web/modules/sniglets/Sniglets/ListView/GeneralList.pm
@@ -18,7 +18,6 @@ use strict;
package Sniglets::ListView::GeneralList;
use Sniglets::ListView::List;
-use RHN::Catalog;
use RHN::DataSource::General;
use RHN::DataSource::Simple;
use RHN::Exception qw/throw/;
14 years, 5 months
2 commits - web/modules
by Jan Pazdziora
web/modules/sniglets/Sniglets/ListView/GeneralList.pm | 72 ------------------
web/modules/sniglets/Sniglets/Lists.pm | 19 ----
2 files changed, 91 deletions(-)
New commits:
commit 4ca930148161506295451dfd5b87ed0c1bd07700
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Dec 11 14:28:32 2009 +0100
purchase_history not used, removing, as well as purchase_history_provider.
diff --git a/web/modules/sniglets/Sniglets/ListView/GeneralList.pm b/web/modules/sniglets/Sniglets/ListView/GeneralList.pm
index 3db80ff..a3e01e4 100644
--- a/web/modules/sniglets/Sniglets/ListView/GeneralList.pm
+++ b/web/modules/sniglets/Sniglets/ListView/GeneralList.pm
@@ -90,10 +90,6 @@ sub _register_modes {
-provider => \&activation_key_provider,
-action_callback => \&activation_key_cb);
- Sniglets::ListView::List->add_mode(-mode => "purchase_history",
- -datasource => RHN::DataSource::General->new,
- -provider => \&purchase_history_provider);
-
Sniglets::ListView::List->add_mode(-mode => "faq_list",
-datasource => RHN::DataSource::General->new);
@@ -200,74 +196,6 @@ sub activation_key_provider {
return (%ret);
}
-sub purchase_history_provider {
- my $self = shift;
- my $pxt = shift;
-
- my $ds = $self->datasource;
-
- my $org_id = $pxt->user->org_id;
- if ($pxt->param('support_org_id')) {
- $org_id = $pxt->param('support_org_id');
- }
-
- my $data = $ds->execute_query(-org_id => $org_id);
-
- my $org = $pxt->user->org;
-
- my $all_ids = [ map { $_->{ID} } @{$data} ];
- $self->all_ids($all_ids);
-
- my $summary; #Keep some data for summary
-
- foreach my $type (qw/trial free paid/) {
- $summary->{$type}->{"${_}_slots"} = 0 foreach (qw/enterprise basic provisioning/);
- }
-
- foreach my $row (@{$data}) {
- my $type = 'trial';
-
- $row->{PAID} ||= 'T';
- if ($row->{PAID} eq 'F') {
- $type = 'free';
- }
- elsif ($row->{PAID} eq 'P') {
- $type = 'paid';
- }
-
- $row->{SLOTS} = $row->{QUANTITY};
-
- $row->{GROUP_LABEL} ||= ''; #prevent warn
-
- if ($row->{GROUP_LABEL} eq 'enterprise_entitled' and $row->{QUANTITY} >= 0) {
- $row->{SLOTS} .= ' Management';
- $summary->{$type}->{enterprise_slots} += $row->{QUANTITY};
- }
- elsif ($row->{GROUP_LABEL} eq 'provisioning_entitled') {
- if (RHN::Catalog->is_provisioning_upgrade_product($row->{PRODUCT_ITEM_CODE})) {
- $row->{SLOTS} .= ' Provisioning Upgrade';
- }
- else {
- $row->{SLOTS} .= ' Provisioning';
- }
- $summary->{$type}->{provisioning_slots} += $row->{QUANTITY};
- }
- elsif ($row->{GROUP_LABEL} eq 'sw_mgr_entitled') {
- $row->{SLOTS} .= ' ' . $org->basic_slot_name;
- $summary->{$type}->{basic_slots} += $row->{QUANTITY};
- }
- }
-
- $pxt->pnotes("purchase_history_summary", $summary);
-
-# slice data last because we need the summary info above
- $data = $ds->slice_data($data, $self->lower, $self->upper);
-
- return (data => $data,
- all_ids => $all_ids,
- alphabar => undef);
-}
-
my @allowed_sort_columns = qw/FB.created BASIC_SLOTS ENTERPRISE_SLOTS/;
sub kickstarts_for_org_provider {
commit f0b0bc9d055b81466683d2de824f6fec297940e5
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Dec 11 14:27:55 2009 +0100
rhn-purchase-history-summary not used anywhere, removing, as well as purchase_history_summary.
diff --git a/web/modules/sniglets/Sniglets/Lists.pm b/web/modules/sniglets/Sniglets/Lists.pm
index 31f5320..5d357d1 100644
--- a/web/modules/sniglets/Sniglets/Lists.pm
+++ b/web/modules/sniglets/Sniglets/Lists.pm
@@ -51,7 +51,6 @@ sub register_tags {
$pxt->register_tag('rhn-errata-list-summary', \&errata_list_summary, 5);
$pxt->register_tag('rhn-system-group-list-summary', \&system_group_list_summary, 5);
- $pxt->register_tag('rhn-purchase-history-summary', \&purchase_history_summary, 5);
$pxt->register_tag('rhn-system-name', \&system_name, -5);
$pxt->register_tag('rhn-time-period-selector', \&time_selector);
@@ -302,24 +301,6 @@ sub system_group_list_summary {
return $html;
}
-sub purchase_history_summary {
- my $pxt = shift;
- my %attr = @_;
-
- my $type = $attr{type} || '';
-
- throw "Not a valid type: '$type'." unless grep { $type eq $_ } qw/free trial paid/;
-
- my $summary = $pxt->pnotes("purchase_history_summary");
- my $html = '';
-
- if ($summary) {
- $html = PXT::Utils->perform_substitutions($attr{__block__}, $summary->{$type});
- }
-
- return $html;
-}
-
sub system_name {
my $pxt = shift;
my %params = @_;
14 years, 5 months
2 commits - schema/spacewalk web/html web/modules
by Jan Pazdziora
schema/spacewalk/common/views/views.deps | 2 -
web/html/network/sales/.htaccess | 9 ----
web/modules/rhn/RHN/DB/DataSource/xml/General_queries.xml | 28 --------------
3 files changed, 39 deletions(-)
New commits:
commit 44361cdf03ec4926d97146582e891d365b35cb56
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Dec 11 14:24:37 2009 +0100
Removing network/sales as it only had .htaccess talking about purchase_history.pxt, which did not exist.
diff --git a/web/html/network/sales/.htaccess b/web/html/network/sales/.htaccess
deleted file mode 100644
index 8f88de5..0000000
--- a/web/html/network/sales/.htaccess
+++ /dev/null
@@ -1,9 +0,0 @@
-<Files purchase_history.pxt>
- AuthType Basic
- AuthName "RHN Org Admin Area"
-
- PerlModule PXT::ApacheHandler
- PerlModule PXT::ApacheAuth
- PerlAuthenHandler PXT::ApacheAuth
- require acl user_role(org_admin)
-</Files>
commit d7d3192fd92ba822391d8454acadbe0fb0ccef29
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Dec 11 14:23:42 2009 +0100
View web_customer_orders does not exist in Spacewalk 0.7, removing; also removing purchase_history query.
diff --git a/schema/spacewalk/common/views/views.deps b/schema/spacewalk/common/views/views.deps
index 4d7d679..46f2da0 100644
--- a/schema/spacewalk/common/views/views.deps
+++ b/schema/spacewalk/common/views/views.deps
@@ -121,8 +121,6 @@ rhn_contact_monitoring :: web_contact web_user_personal_info
rhn_host_monitoring :: rhnServer rhnServerNetInterface \
rhn_interface_monitoring \
rhn_server_monitoring_info
-web_customer_orders :: web_user_order web_user_order_line \
- rh_product web_contact
rhnSharedChannelView :: rhnChannel rhnChannelTrust rhnTrustedOrgs
rhnSharedChannelTreeView :: rhnSharedChannelView
rhnUserActionOverview :: rhnActionStatus rhnUserServerPerms rhnServerAction \
diff --git a/web/modules/rhn/RHN/DB/DataSource/xml/General_queries.xml b/web/modules/rhn/RHN/DB/DataSource/xml/General_queries.xml
index 6502112..e0f1228 100644
--- a/web/modules/rhn/RHN/DB/DataSource/xml/General_queries.xml
+++ b/web/modules/rhn/RHN/DB/DataSource/xml/General_queries.xml
@@ -150,34 +150,6 @@ ORDER BY RT.note, RT.id
</query>
</mode>
-<mode name="purchase_history">
- <query params="org_id">
-SELECT DISTINCT * FROM
-(SELECT wce.customer_id,
- wce.active_flag,
- TO_CHAR(wce.start_date_active, 'YYYY-MM-DD') AS start_date_active,
- TO_CHAR(wce.end_date_active, 'YYYY-MM-DD') AS end_date_active,
- wce.product_name,
- wce.service_name,
- wce.product_item_code,
- wce.service_item_code,
- wce.group_label,
- wce.quantity,
- wce.customer_product_id,
- wce.paid,
- wco.order_id
-from web_customer_orders wco,
- web_customer_entitlements wce
-where wce.customer_id = :org_id
- and wco.customer_id(+) = :org_id
- and wce.product_item_code NOT LIKE '__TAX' -- ugly hack, don't show taxes here
- and wce.quantity >= 0 -- hide the ugly prov upgrade slots
- --and wco.order_id IS NOT NULL
- and wce.customer_product_id = wco.customer_product_id(+)) X
-ORDER BY X.start_date_active DESC, X.order_id DESC, X.product_item_code
- </query>
-</mode>
-
<mode name="user_emailaddress_log">
<query params="support_uid">
SELECT EAL.user_id, WC.login, EAL.address, EAL.reason, TO_CHAR(EAL.created, 'YYYY-MM-DD HH24:MI:SS') as created
14 years, 5 months
3 commits - backend/po backend/server
by Jan Pazdziora
backend/po/Makefile | 2
backend/po/en.po | 1058 +++++++++++++++---------------
backend/po/ro.po | 946 +++++++++++++-------------
backend/po/server.pot | 936 +++++++++++++-------------
backend/server/handlers/xmlrpc/country.py | 1
5 files changed, 1497 insertions(+), 1446 deletions(-)
New commits:
commit 70362c26ad1a1d373f9345754407d9e161136ce3
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Dec 11 14:18:05 2009 +0100
Change caused by make update-po run in backend/po.
diff --git a/backend/po/en.po b/backend/po/en.po
index c05aaa2..2ec4fdc 100644
--- a/backend/po/en.po
+++ b/backend/po/en.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: RHN 2.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-02-28 19:31-0500\n"
+"POT-Creation-Date: 2009-12-11 14:15+0100\n"
"PO-Revision-Date: 2000-08-08 16:51-0400\n"
"Last-Translator: Cristian Gafton <gafton(a)redhat.com>\n"
"Language-Team: English <rhns-i18n(a)redhat.com>\n"
@@ -14,337 +14,83 @@ msgstr ""
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../server/apacheAuth.py:44
+#: ../server/handlers/xmlrpc/queue.py:353
#, python-format
-msgid "incomplete proxy authentication token: %s"
-msgstr ""
-
-#: ../server/apacheAuth.py:60
-#, python-format
-msgid "Sent proxy signature %s does not match ours %s."
-msgstr ""
-
-#: ../server/apacheAuth.py:91
-msgid "declined proxy authentication"
-msgstr ""
-
-#: ../server/applet/applet.py:56
-msgid "Your system was not found in the RHN database"
-msgstr ""
-
-#: ../server/apacheRequest.py:34
-#, python-format
-msgid "Invalid request received (%s)."
+msgid "Invalid action value type %s (%s)"
msgstr ""
-#: ../server/apacheRequest.py:92
+#: ../server/handlers/xmlrpc/queue.py:378
#, python-format
-msgid ""
-"IMPORTANT MESSAGE FOLLOWS:\n"
-"%s"
+msgid "Action %s does not belong to server %s"
msgstr ""
-#: ../server/apacheRequest.py:117
+#: ../server/handlers/xmlrpc/proxy.py:55
#, python-format
-msgid ""
-"While running '%s': caught\n"
-"%s : %s\n"
+msgid "RHN Proxy service not enabled for server profile: \"%s\""
msgstr ""
-#: ../server/apacheRequest.py:499 ../server/redhat_xmlrpc/get_handler.py:32
-#, python-format
-msgid "Invalid URI %s"
+#: ../server/handlers/xmlrpc/proxy.py:74
+msgid "Invalid session key"
msgstr ""
-#: ../server/sat/get_handler.py:64
-msgid "Invalid argument"
+#: ../server/handlers/xmlrpc/proxy.py:82
+msgid "This server ID no longer exists"
msgstr ""
-#: ../server/sat/get_handler.py:89 ../server/sat/kickstart.py:65
+#: ../server/handlers/xmlrpc/errata.py:55
#, python-format
-msgid "Kickstart file %s not found in tree %s"
+msgid "Expected a package name, not: %s"
msgstr ""
-#: ../server/sat/get_handler.py:100 ../server/sat/kickstart.py:74
+#: ../server/handlers/xmlrpc/errata.py:115
#, python-format
-msgid "Kickstart file %s (tree %s) not found on the disk"
+msgid "Expected a package, not: %s"
msgstr ""
-#: ../server/sat/auth.py:28
+#: ../server/handlers/xmlrpc/up2date.py:244
#, python-format
-msgid "RHN Management Satellite service not enabled for server profile: \"%s\""
+msgid "Invalid value %s (type %s)"
msgstr ""
-#: ../server/sat/kickstart.py:44
+#: ../server/handlers/xmlrpc/up2date.py:272
#, python-format
-msgid "Kickstart tree %s not accessible"
-msgstr ""
-
-#: ../server/sat/rhnPackage.py:79 ../server/sat/rhnPackage.py:83
-#: ../server/sat/rhnPackage.py:119 ../server/sat/rhnPackage.py:123
-#: ../server/rhnPackage.py:30 ../server/rhnPackage.py:65
-#: ../server/rhnPackage.py:79 ../server/rhnPackage.py:147
-#: ../server/rhnPackage.py:151 ../server/rhnPackage.py:169
-#: ../server/rhnPackage.py:174 ../server/rhnPackage.py:262
-#: ../server/rhnPackage.py:328 ../server/redhat_xmlrpc/get_handler.py:83
-#, fuzzy, python-format
-msgid "Invalid RPM package %s requested"
-msgstr "Invalid system release version requested"
-
-#: ../server/sat/rhnPackage.py:87 ../server/sat/rhnPackage.py:127
-#: ../server/rhnPackage.py:84 ../server/rhnPackage.py:157
-#: ../server/rhnPackage.py:180 ../server/rhnPackage.py:268
-#: ../server/rhnPackage.py:334 ../server/redhat_xmlrpc/get_handler.py:105
-msgid "Package not found"
+msgid "Unable to retrieve package header %s"
msgstr ""
-#: ../server/sat/rhnRepository.py:32
+#: ../server/handlers/xmlrpc/up2date.py:438
+#: ../server/handlers/xmlrpc/up2date.py:469
+#: ../server/handlers/xmlrpc/up2date.py:501
#, python-format
-msgid "Package does not exist or unauthorized to retrieve it %s"
+msgid "Invalid value %s (%s)"
msgstr ""
-#: ../server/rhnSQL/sql_lib.py:67 ../server/xmlrpc/up2date.py:523
+#: ../server/handlers/xmlrpc/up2date.py:540 ../server/rhnSQL/sql_lib.py:81
#, python-format
msgid "Invalid value for %s in package tuple: %s (%s)"
msgstr ""
-#: ../server/rhnSQL/sql_lib.py:79 ../server/xmlrpc/up2date.py:535
+#: ../server/handlers/xmlrpc/up2date.py:552 ../server/rhnSQL/sql_lib.py:93
#, python-format
msgid "Invalid package parameter %s (%s)"
msgstr ""
-#. nope, not reserved either
-#: ../server/rhnUser.py:490
-#, python-format
-msgid "Username `%s' has not been reserved"
-msgstr ""
-
-#. New accounts have to specify an e-mail address
-#: ../server/rhnUser.py:496
-msgid "E-mail address not specified"
-msgstr ""
-
-#. wrong organization
-#. Invalid org password
-#: ../server/rhnUser.py:551 ../server/rhnUser.py:555
-msgid "Invalid Organization Credentials"
-msgstr ""
-
-#: ../server/rhnUser.py:561
-#, python-format
-msgid "User `%s' not a member of organization %s"
-msgstr ""
-
-#: ../server/rhnUser.py:589
-#, python-format
-msgid "username should be at least %d characters"
-msgstr ""
-
-#: ../server/rhnUser.py:600
-#, python-format
-msgid "username = `%s', invalid character `%s'"
-msgstr ""
-
-#: ../server/rhnUser.py:618
-#, python-format
-msgid "Please limit your e-mail address to %s chars"
-msgstr ""
-
-#: ../server/rhnUser.py:635
-#, python-format
-msgid ""
-"A user with the supplied e-mail address (%s)\n"
-" is already registered with Red Hat Network"
-msgstr ""
-
-#: ../server/rhnUser.py:704
-#, python-format
-msgid "password must be at least %d characters"
-msgstr ""
-
-#: ../server/rhnUser.py:721
-#, python-format
-msgid "password contains character `%s'"
-msgstr ""
-
-#: ../server/rhnUser.py:728
-#, python-format
-msgid "username should be at least %d characters long"
-msgstr ""
-
-#: ../server/rhnUser.py:739
-#, python-format
-msgid "Cannot register usernames ending with %s"
-msgstr ""
-
-#: ../server/importlib/userAuth.py:71 ../server/importlib/userAuth.py:75
-msgid "You are not authorized to manage packages in the null org"
-msgstr ""
-
-#: ../server/importlib/userAuth.py:82
-#, python-format
-msgid "You are not allowed to manage packages in the %s org"
-msgstr ""
-
-#: ../server/importlib/userAuth.py:100
-msgid "You are not allowed to perform administrative tasks"
-msgstr ""
-
-#: ../server/importlib/userAuth.py:127
-#, python-format
-msgid ""
-"You are not allowed to manage channel %s, or that channel does not exist"
-msgstr ""
-
-#: ../server/importlib/userAuth.py:181
-#, python-format
-msgid "Channel %s does not exist "
-msgstr ""
-
-#: ../server/rhnServer/server_token.py:67
-#, python-format
-msgid "Token `%s' has more than one base channel assigned"
-msgstr ""
-
-#: ../server/rhnServer/server_token.py:69
-msgid "Conflicting base channels"
-msgstr ""
-
-#: ../server/rhnServer/server_token.py:171
-#, python-format
-msgid "Failed to add server to group %s"
-msgstr ""
-
-#: ../server/rhnServer/server_token.py:452
-#, python-format
-msgid "Maximum usage count of %s reached"
-msgstr ""
-
-#: ../server/rhnServer/server_token.py:549
-#, python-format
-msgid "Could not find token '%s'"
-msgstr ""
-
-#. Cannot use activation keys from different orgs
-#: ../server/rhnServer/server_token.py:569
-msgid "Tokens from mismatching orgs"
-msgstr ""
-
-#. Two tokens with different kickstart sessions
-#: ../server/rhnServer/server_token.py:579
-msgid "Kickstart session mismatch"
-msgstr ""
-
-#: ../server/rhnServer/server_token.py:595
-#, python-format
-msgid ""
-"Conflicting entitlement levels for tokens:\n"
-"`%s' (%s) and `%s' (%s)"
-msgstr ""
-
-#: ../server/rhnServer/server_token.py:612
-msgid "Stacking of re-registration tokens is not supported"
-msgstr ""
-
-#: ../server/rhnServer/server_token.py:704
-msgid ""
-"Registration failed: RHN Software Management service entitlements exhausted"
-msgstr ""
-
-#: ../server/rhnServer/server_class.py:84
-#, python-format
-msgid "Architecture `%s' is not supported"
-msgstr ""
-
-#. ignore ORA-20277: (product_no_service)
-#: ../server/rhnServer/server_class.py:457
-msgid "Attempt to register a system failed"
-msgstr ""
-
-#: ../server/rhnHandler.py:11
-#, python-format
-msgid ""
-"\n"
-" Your demo account has been disabled. To enable your account, you must \n"
-" verify your email address by visiting:\n"
-"\n"
-" %(email_link)s\n"
-"\n"
-" You may also enable your account by purchasing Red Hat Network service "
-"at:\n"
-"\n"
-" https://rhn.redhat.com/network/sales/index.pxt\n"
-" \n"
-" Your account name: %(login)s\n"
-" Current email on file: %(email)s\n"
-msgstr ""
-
-#: ../server/rhnHandler.py:25
-#, python-format
-msgid ""
-"\n"
-" Your demo account has been disabled. To enable your account, you must\n"
-" fill out the latest Red Hat Network survey by visiting:\n"
-"\n"
-" %(survey_link)s\n"
-"\n"
-" You may also enable your Red Hat Network account by purchasing service "
-"at:\n"
-"\n"
-" https://rhn.redhat.com/network/sales/index.pxt\n"
-"\n"
-" Your account name: %(login)s\n"
-msgstr ""
-
-#: ../server/rhnHandler.py:75
-msgid ""
-"Please run rhn_register (or up2date --register on Red Hat Enterprise Linux 3 "
-"or later)\n"
-"as root on this client"
-msgstr ""
-
-#: ../server/rhnHandler.py:97
-#, python-format
-msgid "Service not enabled for system profile: \"%s\""
-msgstr ""
-
-#: ../server/xmlrpc/queue.py:342
-#, python-format
-msgid "Invalid action value type %s (%s)"
-msgstr ""
-
-#: ../server/xmlrpc/queue.py:367
-#, python-format
-msgid "Action %s does not belong to server %s"
-msgstr ""
-
-#: ../server/xmlrpc/errata.py:44
-#, python-format
-msgid "Expected a package name, not: %s"
-msgstr ""
-
-#: ../server/xmlrpc/errata.py:103
-#, python-format
-msgid "Expected a package, not: %s"
-msgstr ""
-
-#: ../server/xmlrpc/registration.py:157
+#: ../server/handlers/xmlrpc/registration.py:167
msgid "Required data missing"
msgstr ""
-#: ../server/xmlrpc/registration.py:161
+#: ../server/handlers/xmlrpc/registration.py:171
msgid "Required members missing"
msgstr ""
-#: ../server/xmlrpc/registration.py:182
+#: ../server/handlers/xmlrpc/registration.py:180
msgid "Attempt to register a system to an invalid username"
msgstr ""
-#: ../server/xmlrpc/registration.py:351
+#: ../server/handlers/xmlrpc/registration.py:847
msgid "Invalid system release version requested"
msgstr "Invalid system release version requested"
-#: ../server/xmlrpc/registration.py:484
+#: ../server/handlers/xmlrpc/registration.py:1035
msgid "Red Hat Network Welcome Message"
msgstr ""
"Now for the first time ever, information, updates, and services\n"
@@ -371,7 +117,7 @@ msgstr ""
"Click on the \"Next\" button to register now, or click \"Cancel\"\n"
"to banish this program forever."
-#: ../server/xmlrpc/registration.py:494
+#: ../server/handlers/xmlrpc/registration.py:1045
msgid "Red Hat Network Privacy Statement"
msgstr ""
" We think our customers understand better than anyone else how Red\n"
@@ -586,90 +332,47 @@ msgstr ""
" If we do make changes, the revised Privacy Statement will be posted\n"
" on this site."
-#: ../server/xmlrpc/registration.py:505
+#: ../server/handlers/xmlrpc/registration.py:1064
msgid "Expected a dictionary as a product argument"
msgstr ""
-#: ../server/xmlrpc/registration.py:537 ../server/xmlrpc/registration.py:590
+#: ../server/handlers/xmlrpc/registration.py:1096
+#: ../server/handlers/xmlrpc/registration.py:1169
#, python-format
msgid "Not a valid Country: %s"
msgstr ""
-#: ../server/xmlrpc/registration.py:622
-msgid ""
-"\n"
-" The product registration code can be found on the\n"
-" registration card included with the product"
-msgstr ""
-
-#. already registered
-#: ../server/xmlrpc/registration.py:627
-msgid ""
-"\n"
-" The code that you have entered has been already\n"
-" registered. Please contact Red Hat Customer Support\n"
-" at http://www.redhat.com/services/tools/installation/\n"
-" "
-msgstr ""
-
-#: ../server/xmlrpc/registration.py:633
-#, python-format
-msgid ""
-"\n"
-" Invalid product registration number.\n"
-" The product registration code can be found on the\n"
-" registration card included with the product. Please\n"
-" check carefully that you have entered the correct\n"
-" registration number. Invalid: %s"
-msgstr ""
-
-#: ../server/xmlrpc/registration.py:773
+#: ../server/handlers/xmlrpc/registration.py:1391
#, python-format
msgid "Insufficient subscription permissions for release, arch (%s, %s)"
msgstr ""
-#: ../server/xmlrpc/registration.py:788
+#: ../server/handlers/xmlrpc/registration.py:1408
#, python-format
msgid "Invalid value '%s' for %s (%s)"
msgstr ""
-#: ../server/xmlrpc/up2date.py:232
-#, python-format
-msgid "Invalid value %s (type %s)"
-msgstr ""
-
-#: ../server/xmlrpc/up2date.py:260
-#, python-format
-msgid "Unable to retrieve package header %s"
+#: ../server/handlers/sat/auth.py:41
+msgid "ISS is disabled on this satellite."
msgstr ""
-#: ../server/xmlrpc/up2date.py:424 ../server/xmlrpc/up2date.py:454
-#: ../server/xmlrpc/up2date.py:485
+#: ../server/handlers/sat/auth.py:53
#, python-format
-msgid "Invalid value %s (%s)"
-msgstr ""
-
-#: ../server/xmlrpc/proxy.py:46
-#, python-format
-msgid "RHN Proxy service not enabled for server profile: \"%s\""
+msgid "Server \"%s\" is not enabled for ISS."
msgstr ""
-#: ../server/xmlrpc/proxy.py:65
-msgid "Invalid session key"
-msgstr ""
-
-#: ../server/xmlrpc/proxy.py:73
-msgid "This server ID no longer exists"
+#: ../server/handlers/applet/applet.py:65
+msgid "Your system was not found in the RHN database"
msgstr ""
-#: ../server/rhnChannel.py:1565
+#: ../server/rhnChannel.py:2119
#, python-format
msgid ""
"Your account does not have access to any channels matching (release='%"
"(release)s', arch='%(arch)s')%(www_activation)s"
msgstr ""
-#: ../server/rhnChannel.py:1575
+#: ../server/rhnChannel.py:2129
msgid ""
"\n"
"If you have a registration number, please register with it first at http://"
@@ -677,38 +380,21 @@ msgid ""
"\n"
msgstr ""
-#: ../server/rhnChannel.py:1585
+#: ../server/rhnChannel.py:2139
#, python-format
msgid "Insufficient subscription permissions for release (%s, %s"
msgstr ""
#. Various messages that can be reused
-#: ../server/rhnChannel.py:1837 ../server/rhnChannel.py:1847
-#: ../server/rhnChannel.py:1854 ../server/rhnChannel.py:1865
-#: ../server/rhnChannel.py:1880 ../server/rhnChannel.py:1888
+#.
+#. bretm 02/07/2007 -- when we have better old-client documentation, probably
+#. will be safe to get rid of all this crap
+#: ../server/rhnChannel.py:2410 ../server/rhnChannel.py:2421
+#: ../server/rhnChannel.py:2436 ../server/rhnChannel.py:2444
msgid "System Registered but Inactive"
msgstr ""
-#: ../server/rhnChannel.py:1838
-msgid ""
-"\n"
-" Your system has been registered, but will not receive updates until \n"
-" your product has been activated. Visit our website at:\n"
-" \n"
-" http://www.redhat.com/now\n"
-"\n"
-" ...to activate your product.\n"
-msgstr ""
-
-#: ../server/rhnChannel.py:1848
-msgid ""
-"\n"
-" Your system has been registered, but will not receive updates because\n"
-" it could not be subscribed to a base channel. Please contact your\n"
-" organization administrator for assistance.\n"
-msgstr ""
-
-#: ../server/rhnChannel.py:1855
+#: ../server/rhnChannel.py:2411
#, python-format
msgid ""
"\n"
@@ -717,12 +403,12 @@ msgid ""
"because it is not subscribed to a channel. If you have not yet\n"
"activated your product for service, please visit our website at:\n"
" \n"
-" http://www.redhat.com/now\n"
+" http://www.redhat.com/apps/activate/\n"
"\n"
"...to activate your product."
msgstr ""
-#: ../server/rhnChannel.py:1866
+#: ../server/rhnChannel.py:2422
#, python-format
msgid ""
"\n"
@@ -732,7 +418,7 @@ msgid ""
"Please contact your organization administrator for assistance.\n"
msgstr ""
-#: ../server/rhnChannel.py:1873
+#: ../server/rhnChannel.py:2429
#, python-format
msgid ""
"\n"
@@ -742,7 +428,7 @@ msgid ""
" %(entitlement_url)s\n"
msgstr ""
-#: ../server/rhnChannel.py:1881
+#: ../server/rhnChannel.py:2437
#, python-format
msgid ""
"\n"
@@ -753,7 +439,7 @@ msgid ""
" %(entitlement_url)s\n"
msgstr ""
-#: ../server/rhnChannel.py:1889
+#: ../server/rhnChannel.py:2445
msgid ""
"\n"
" This system has been successfully registered, but the channel "
@@ -761,199 +447,435 @@ msgid ""
" were exhausted\n"
msgstr ""
-#: ../common/rhnException.py:28
+#: ../server/importlib/userAuth.py:90 ../server/importlib/userAuth.py:94
+msgid "You are not authorized to manage packages in the null org"
+msgstr ""
+
+#: ../server/importlib/userAuth.py:101
+#, python-format
+msgid "You are not allowed to manage packages in the %s org"
+msgstr ""
+
+#: ../server/importlib/userAuth.py:119
+msgid "You are not allowed to perform administrative tasks"
+msgstr ""
+
+#: ../server/importlib/userAuth.py:146
+#, python-format
+msgid ""
+"You are not allowed to manage channel %s, or that channel does not exist"
+msgstr ""
+
+#: ../server/importlib/userAuth.py:237
+#, python-format
+msgid "Channel %s does not exist "
+msgstr ""
+
+#: ../server/apacheAuth.py:55
+#, python-format
+msgid "incomplete proxy authentication token: %s"
+msgstr ""
+
+#: ../server/apacheAuth.py:71
+#, python-format
+msgid "Sent proxy signature %s does not match ours %s."
+msgstr ""
+
+#: ../server/apacheAuth.py:102
+msgid "declined proxy authentication"
+msgstr ""
+
+#. ignore ORA-20277: (product_no_service)
+#: ../server/rhnServer/server_lib.py:66
+msgid "Attempt to register a system failed"
+msgstr ""
+
+#: ../server/rhnServer/server_token.py:85
+#, python-format
+msgid "Token `%s' has more than one base channel assigned"
+msgstr ""
+
+#: ../server/rhnServer/server_token.py:87
+msgid "Conflicting base channels"
+msgstr ""
+
+#: ../server/rhnServer/server_token.py:211
+#, python-format
+msgid "Failed to add server to group %s"
+msgstr ""
+
+#: ../server/rhnServer/server_token.py:511
+#, python-format
+msgid "Maximum usage count of %s reached"
+msgstr ""
+
+#: ../server/rhnServer/server_token.py:642
+msgid ""
+"Registration failed: RHN Software Management service entitlements exhausted"
+msgstr ""
+
+#: ../server/rhnServer/server_token.py:759
+msgid ""
+"Stacking of re-registration tokens with different base entitlements is not "
+"supported"
+msgstr ""
+
+#: ../server/rhnServer/server_token.py:837
+#, python-format
+msgid "Could not find token '%s'"
+msgstr ""
+
+#. Cannot use activation keys from different orgs
+#: ../server/rhnServer/server_token.py:869
+msgid "Tokens from mismatching orgs"
+msgstr ""
+
+#. Two tokens with different kickstart sessions
+#: ../server/rhnServer/server_token.py:879
+msgid "Kickstart session mismatch"
+msgstr ""
+
+#: ../server/rhnServer/server_token.py:899
+msgid "Stacking of re-registration tokens is not supported"
+msgstr ""
+
+#: ../server/rhnServer/server_class.py:98
+#, python-format
+msgid "Architecture `%s' is not supported"
+msgstr ""
+
+#: ../server/rhnPackage.py:41 ../server/rhnPackage.py:76
+#: ../server/rhnPackage.py:90 ../server/rhnPackage.py:159
+#: ../server/rhnPackage.py:163 ../server/rhnPackage.py:221
+#: ../server/rhnPackage.py:226 ../server/rhnPackage.py:314
+#: ../server/rhnPackage.py:380
+#, fuzzy, python-format
+msgid "Invalid RPM package %s requested"
+msgstr "Invalid system release version requested"
+
+#: ../server/rhnPackage.py:95 ../server/rhnPackage.py:169
+#: ../server/rhnPackage.py:232 ../server/rhnPackage.py:320
+#: ../server/rhnPackage.py:386
+msgid "Package not found"
+msgstr ""
+
+#: ../server/apacheRequest.py:47
+#, python-format
+msgid "Invalid request received (%s)."
+msgstr ""
+
+#: ../server/apacheRequest.py:105
+#, python-format
+msgid ""
+"IMPORTANT MESSAGE FOLLOWS:\n"
+"%s"
+msgstr ""
+
+#: ../server/apacheRequest.py:130
+#, python-format
+msgid ""
+"While running '%s': caught\n"
+"%s : %s\n"
+msgstr ""
+
+#: ../server/apacheRequest.py:556
+#, python-format
+msgid "Invalid URI %s"
+msgstr ""
+
+#: ../server/rhnHandler.py:58
+msgid ""
+"Please run rhn_register (or up2date --register on Red Hat Enterprise Linux 3 "
+"or later)\n"
+"as root on this client"
+msgstr ""
+
+#: ../server/rhnHandler.py:77
+#, python-format
+msgid "Service not enabled for system profile: \"%s\""
+msgstr ""
+
+#: ../server/rhnUser.py:382 ../server/rhnUser.py:385
+msgid "Invalid username/password combination"
+msgstr ""
+
+#: ../server/rhnUser.py:430
+#, python-format
+msgid ""
+"\n"
+" %s Account has been deactivated on this server.\n"
+" Please contact your Org administrator for more help."
+msgstr ""
+
+#. nope, not reserved either
+#: ../server/rhnUser.py:548
+#, python-format
+msgid "Username `%s' has not been reserved"
+msgstr ""
+
+#. New accounts have to specify an e-mail address
+#: ../server/rhnUser.py:554
+msgid "E-mail address not specified"
+msgstr ""
+
+#. wrong organization
+#. Invalid org password
+#: ../server/rhnUser.py:609 ../server/rhnUser.py:613
+msgid "Invalid Organization Credentials"
+msgstr ""
+
+#: ../server/rhnUser.py:619
+#, python-format
+msgid "User `%s' not a member of organization %s"
+msgstr ""
+
+#: ../server/rhnUser.py:647
+#, python-format
+msgid "username should be at least %d characters"
+msgstr ""
+
+#: ../server/rhnUser.py:650
+#, python-format
+msgid "username should be less than %d characters"
+msgstr ""
+
+#: ../server/rhnUser.py:661
+#, python-format
+msgid "username = `%s', invalid character `%s'"
+msgstr ""
+
+#: ../server/rhnUser.py:679
+#, python-format
+msgid "Please limit your e-mail address to %s chars"
+msgstr ""
+
+#: ../server/rhnUser.py:698
+#, python-format
+msgid ""
+"A user with the supplied e-mail address (%s)\n"
+" is already registered with Red Hat Network"
+msgstr ""
+
+#: ../server/rhnUser.py:767
+#, python-format
+msgid "password must be at least %d characters"
+msgstr ""
+
+#: ../server/rhnUser.py:770
+#, python-format
+msgid "Password must be shorter than %d characters"
+msgstr ""
+
+#: ../server/rhnUser.py:788
+#, python-format
+msgid "password contains character `%s'"
+msgstr ""
+
+#: ../server/rhnUser.py:795
+#, python-format
+msgid "username should be at least %d characters long"
+msgstr ""
+
+#: ../server/rhnUser.py:806
+#, python-format
+msgid "Cannot register usernames ending with %s"
+msgstr ""
+
+#: ../common/rhnException.py:43
msgid "Outage mode"
msgstr ""
#. 0-999: RHN client/client-like interaction errors:
-#: ../common/rhnException.py:30
+#: ../common/rhnException.py:45
msgid "This does not appear to be a valid username."
msgstr ""
-#: ../common/rhnException.py:31
+#: ../common/rhnException.py:46
msgid "Invalid username and password combination."
msgstr ""
-#: ../common/rhnException.py:32
-msgid "This username is already taken, or the password is incorrect."
+#: ../common/rhnException.py:47
+msgid "This login is already taken, or the password is incorrect."
msgstr ""
-#: ../common/rhnException.py:33
+#: ../common/rhnException.py:48
msgid "Permission denied."
msgstr ""
-#: ../common/rhnException.py:34
+#: ../common/rhnException.py:49
msgid "Can not create new entry."
msgstr ""
-#: ../common/rhnException.py:35
+#: ../common/rhnException.py:50
msgid "Object not found."
msgstr ""
-#: ../common/rhnException.py:36
+#: ../common/rhnException.py:51
msgid "Account limits exceeded."
msgstr ""
-#: ../common/rhnException.py:37
+#: ../common/rhnException.py:52
#, fuzzy
msgid "Invalid System Digital ID."
msgstr "Invalid system release version requested"
-#: ../common/rhnException.py:38
+#: ../common/rhnException.py:53
#, fuzzy
msgid "Invalid System Credentials."
msgstr "Invalid system release version requested"
-#: ../common/rhnException.py:39
+#: ../common/rhnException.py:54
msgid "Could not retrieve user data from database."
msgstr ""
-#: ../common/rhnException.py:40
+#: ../common/rhnException.py:55
msgid "Valid username required."
msgstr ""
-#: ../common/rhnException.py:41
+#: ../common/rhnException.py:56
msgid "Valid password required."
msgstr ""
-#: ../common/rhnException.py:42
+#: ../common/rhnException.py:57
msgid "Minimum username length violation."
msgstr ""
-#: ../common/rhnException.py:43
+#: ../common/rhnException.py:58
msgid "Minimum password length violation."
msgstr ""
-#: ../common/rhnException.py:44
+#: ../common/rhnException.py:59
msgid "The username contains invalid characters."
msgstr ""
-#: ../common/rhnException.py:45
+#: ../common/rhnException.py:60
msgid "Invalid product registration code."
msgstr ""
-#: ../common/rhnException.py:46
+#: ../common/rhnException.py:61
msgid "File not found."
msgstr ""
-#: ../common/rhnException.py:47
+#: ../common/rhnException.py:62
msgid "Invalid Architecture and OS release combination."
msgstr ""
-#: ../common/rhnException.py:48
+#: ../common/rhnException.py:63
msgid "Architecture and OS version combination is not supported."
msgstr ""
-#: ../common/rhnException.py:49
+#: ../common/rhnException.py:64
msgid "Could not retrieve system data from database."
msgstr ""
-#: ../common/rhnException.py:50
+#: ../common/rhnException.py:65
msgid "Invalid arguments passed to function."
msgstr ""
-#: ../common/rhnException.py:51
+#: ../common/rhnException.py:66
msgid "Unable to retrieve requested entry."
msgstr ""
-#: ../common/rhnException.py:52
+#: ../common/rhnException.py:67
msgid "Could not update database entry."
msgstr ""
-#: ../common/rhnException.py:53
+#: ../common/rhnException.py:68
msgid "Unsupported server architecture."
msgstr ""
-#: ../common/rhnException.py:54
+#: ../common/rhnException.py:69
msgid "LDAP operation failed."
msgstr ""
-#: ../common/rhnException.py:55
+#: ../common/rhnException.py:70
msgid "Backend RPM database failure: can not retrieve requested information."
msgstr ""
-#: ../common/rhnException.py:56
+#: ../common/rhnException.py:72
msgid "Server Entry is busy."
msgstr ""
-#: ../common/rhnException.py:57
+#: ../common/rhnException.py:73
#, python-format
msgid ""
"\n"
" The anonymous server functionality is no longer available.\n"
"\n"
-" Please re-register this system by running rhn_register \n"
+" Please re-register this system by running rhn_register\n"
" (or up2date --register on Red Hat Enterprise Linux 3+) as root.\n"
" Please visit https://%(hostname)s/rhn/systems/SystemEntitlements.do\n"
-" or login at https://%(hostname)s, and from the \"Systems\" tab,\n"
-" select \"System Entitlements\" to enable RHN service for this system.\n"
+" or login at https://%(hostname)s, and from the \"Overview\" tab,\n"
+" select \"Subscription Management\" to enable RHN service for this "
+"system.\n"
" "
msgstr ""
-#: ../common/rhnException.py:66
+#: ../common/rhnException.py:82
msgid "Record not available in the database."
msgstr ""
-#: ../common/rhnException.py:67
+#: ../common/rhnException.py:83
msgid "Invalid value for entry."
msgstr ""
-#: ../common/rhnException.py:68
+#: ../common/rhnException.py:84
#, python-format
msgid ""
"\n"
" This system does not have a valid entitlement for Red Hat Network.\n"
" Please visit https://%(hostname)s/rhn/systems/SystemEntitlements.do\n"
-" or login at https://%(hostname)s, and from the \"Systems\" tab,\n"
-" select \"System Entitlements\" to enable RHN service for this system.\n"
+" or login at https://%(hostname)s, and from the \"Overview\" tab,\n"
+" select \"Subscription Management\" to enable RHN service for this "
+"system.\n"
" "
msgstr ""
-#: ../common/rhnException.py:74
+#: ../common/rhnException.py:90
msgid "Channel error"
msgstr ""
-#: ../common/rhnException.py:75
+#: ../common/rhnException.py:91
msgid "Client session token is invalid."
msgstr ""
-#: ../common/rhnException.py:76
+#: ../common/rhnException.py:92
msgid "Client session token has expired."
msgstr ""
-#: ../common/rhnException.py:77
+#: ../common/rhnException.py:93
msgid "You are not authorized to retrieve the requested object."
msgstr ""
-#: ../common/rhnException.py:78
+#: ../common/rhnException.py:94
msgid "Invalid action"
msgstr ""
-#: ../common/rhnException.py:79
+#: ../common/rhnException.py:95
msgid "You are not allowed to perform administrative tasks on this system."
msgstr ""
-#: ../common/rhnException.py:80
+#: ../common/rhnException.py:97
msgid "The system is already subscribed to the specified channel."
msgstr ""
-#: ../common/rhnException.py:81
+#: ../common/rhnException.py:98
msgid "The system is not currently subscribed to the specified channel."
msgstr ""
-#: ../common/rhnException.py:82
+#: ../common/rhnException.py:99
msgid "The specified channel does not exist."
msgstr ""
-#: ../common/rhnException.py:83
+#: ../common/rhnException.py:100
msgid "Invalid channel version."
msgstr ""
-#: ../common/rhnException.py:84
+#: ../common/rhnException.py:101
msgid "Invalid ORG_ID requested"
msgstr ""
-#: ../common/rhnException.py:85
+#: ../common/rhnException.py:102
msgid ""
"\n"
" User group membership limits exceeded.\n"
@@ -967,7 +889,7 @@ msgid ""
" "
msgstr ""
-#: ../common/rhnException.py:93
+#: ../common/rhnException.py:110
msgid ""
"\n"
" System group membership limits exceeded.\n"
@@ -981,7 +903,7 @@ msgid ""
" "
msgstr ""
-#: ../common/rhnException.py:101
+#: ../common/rhnException.py:118
msgid ""
"\n"
" Invalid architecture.\n"
@@ -990,7 +912,7 @@ msgid ""
" "
msgstr ""
-#: ../common/rhnException.py:106
+#: ../common/rhnException.py:123
msgid ""
"\n"
" Incompatible architectures.\n"
@@ -1000,11 +922,11 @@ msgid ""
" "
msgstr ""
-#: ../common/rhnException.py:112
+#: ../common/rhnException.py:129
msgid "Invalid RPM header"
msgstr ""
-#: ../common/rhnException.py:113
+#: ../common/rhnException.py:130
msgid ""
"\n"
" Invalid channel.\n"
@@ -1013,7 +935,7 @@ msgid ""
" "
msgstr ""
-#: ../common/rhnException.py:118
+#: ../common/rhnException.py:135
#, python-format
msgid ""
"\n"
@@ -1034,22 +956,22 @@ msgid ""
msgstr ""
#. For the uploading tools
-#: ../common/rhnException.py:134
+#: ../common/rhnException.py:151
msgid "Invalid information uploaded to the server"
msgstr ""
-#: ../common/rhnException.py:135
+#: ../common/rhnException.py:152
#, python-format
msgid ""
"\n"
" Demo service currently disabled due to high load. If you would like\n"
-" to see Red Hat's policies on Demo service, or find out how you can \n"
-" purchase a subscription service and receive priority download access, \n"
+" to see Red Hat's policies on Demo service, or find out how you can\n"
+" purchase a subscription service and receive priority download access,\n"
" please go to http://%(hostname)s/preview/index.pxt\n"
" "
msgstr ""
-#: ../common/rhnException.py:141
+#: ../common/rhnException.py:158
#, python-format
msgid ""
"\n"
@@ -1061,30 +983,50 @@ msgid ""
" "
msgstr ""
-#: ../common/rhnException.py:147
+#: ../common/rhnException.py:164
msgid "Error uploading network interfaces configuration."
msgstr ""
+#: ../common/rhnException.py:165
+msgid ""
+"\n"
+" Package Upload Failed due to uniqueness constraint violation.\n"
+" Make sure the package does not have any duplicate dependencies or\n"
+" does not already exists on the server\n"
+" "
+msgstr ""
+
+#: ../common/rhnException.py:170
+msgid ""
+"\n"
+" The --force rhnpush option is disabled on this server. \n"
+" Please contact your Satellite administrator for more help.\n"
+" "
+msgstr ""
+
#. 60-70: token errors
-#: ../common/rhnException.py:150
-#, fuzzy
-msgid "Invalid system registration token"
-msgstr "Invalid system release version requested"
+#: ../common/rhnException.py:176
+msgid ""
+"\n"
+" The activation token specified could not be found on the server.\n"
+" Please retry with a valid key.\n"
+" "
+msgstr ""
-#: ../common/rhnException.py:151
+#: ../common/rhnException.py:180
msgid "Too many systems registered using this registration token"
msgstr ""
-#: ../common/rhnException.py:152
+#: ../common/rhnException.py:181
msgid "Token contains invalid, obsoleted or insufficient settings"
msgstr ""
-#: ../common/rhnException.py:153
+#: ../common/rhnException.py:182
msgid "Conflicting activation tokens"
msgstr ""
#. 70-80: channel subscription errors
-#: ../common/rhnException.py:156
+#: ../common/rhnException.py:185
msgid ""
"\n"
" All available subscriptions for the requested channel have been "
@@ -1093,143 +1035,170 @@ msgid ""
" "
msgstr ""
-#: ../common/rhnException.py:160
+#: ../common/rhnException.py:189
msgid ""
"\n"
" You do not have subscription permission to the designated channel.\n"
-" Please refer to your organization's channel or organization "
-"administrators for\n"
-" further details.\n"
+" Please refer to your organization's channel or organization\n"
+" administrators for further details.\n"
" "
msgstr ""
+#: ../common/rhnException.py:194
+msgid "You can not unsubscribe from base channel."
+msgstr ""
+
#. 80-90: server group errors
-#: ../common/rhnException.py:167
+#: ../common/rhnException.py:197
msgid "There was an error while trying to join the system to its groups"
msgstr ""
#. 90-100: entitlement errors
-#: ../common/rhnException.py:170
+#: ../common/rhnException.py:200
msgid "Unable to entitle system"
msgstr ""
-#: ../common/rhnException.py:171
+#: ../common/rhnException.py:201
msgid ""
"Registration token unable to entitle system: maximum membership exceeded"
msgstr ""
#. 100-109: e-mail and uuid related faults
-#: ../common/rhnException.py:174
+#: ../common/rhnException.py:205
msgid "Maximum e-mail length violation."
msgstr ""
-#: ../common/rhnException.py:175
+#: ../common/rhnException.py:206
msgid "Changing e-mail address is not supported."
msgstr ""
-#: ../common/rhnException.py:176
+#: ../common/rhnException.py:207
msgid "Unique e-mail address check failed."
msgstr ""
-#: ../common/rhnException.py:177
+#: ../common/rhnException.py:208
msgid "This system has been previously registered."
msgstr ""
-#: ../common/rhnException.py:178
+#: ../common/rhnException.py:209
msgid "Invalid username"
msgstr ""
#. 110-129: disabled org errors
-#: ../common/rhnException.py:181
+#: ../common/rhnException.py:212
msgid "Service for your account has been disabled."
msgstr ""
-#: ../common/rhnException.py:182
+#: ../common/rhnException.py:213
msgid "Email address not validated; service disabled"
msgstr ""
-#: ../common/rhnException.py:183
+#: ../common/rhnException.py:214
msgid "Survey not filled out; service disabled"
msgstr ""
#. 130-140: bugzilla errata import errors
-#: ../common/rhnException.py:186
+#: ../common/rhnException.py:217
msgid "Bugzilla erratum import error"
msgstr ""
#. 140-159 applet errors
-#: ../common/rhnException.py:189
+#: ../common/rhnException.py:220
msgid "Unable to look up server"
msgstr ""
#. 160-179: OSAD errors
-#: ../common/rhnException.py:192
+#: ../common/rhnException.py:223
msgid "Required argument is missing"
msgstr ""
#. 500-599: Package Uploader errors
-#: ../common/rhnException.py:195
+#: ../common/rhnException.py:226
msgid "Missing HTTP header information"
msgstr ""
-#: ../common/rhnException.py:196
-msgid "The package's md5sum signature does not match the header one"
+#: ../common/rhnException.py:227
+msgid "The package's checksum signature does not match the header one"
msgstr ""
-#: ../common/rhnException.py:197
+#: ../common/rhnException.py:228
msgid "Header information does not match package metainformation"
msgstr ""
-#: ../common/rhnException.py:198
+#: ../common/rhnException.py:229
msgid "Package with a different signature already uploaded"
msgstr ""
-#: ../common/rhnException.py:199
+#: ../common/rhnException.py:230
msgid "Not an RPM package"
msgstr ""
-#: ../common/rhnException.py:200
+#: ../common/rhnException.py:231
msgid "Unsigned RPM package"
msgstr ""
-#: ../common/rhnException.py:201
+#: ../common/rhnException.py:232
msgid "Incompatible package and channel architectures"
msgstr ""
+#: ../common/rhnException.py:233
+msgid "Incompatible checksum type"
+msgstr ""
+
+#. 600-699: RHEL5+ EN errors
+#: ../common/rhnException.py:236
+msgid "Invalid Entitlement Number"
+msgstr ""
+
+#: ../common/rhnException.py:237
+msgid "No entitlement information tied to hardware"
+msgstr ""
+
+#: ../common/rhnException.py:238
+msgid "Installation number is not entitling"
+msgstr ""
+
+#. 700-799: Additional user input verification errors.
+#: ../common/rhnException.py:241
+msgid "Maximum username length violation"
+msgstr ""
+
+#: ../common/rhnException.py:242
+msgid "Maximum password length violation"
+msgstr ""
+
#. 1000-1999: RHN Proxy specific errors:
#. issued by an RHN Proxy to the client
-#: ../common/rhnException.py:205
+#: ../common/rhnException.py:246
msgid "RHN Proxy error."
msgstr ""
-#: ../common/rhnException.py:206
+#: ../common/rhnException.py:247
msgid "RHN Proxy unable to login."
msgstr ""
#. issued by an RHN Server/Satellite to the proxy
-#: ../common/rhnException.py:208
+#: ../common/rhnException.py:249
msgid ""
"\n"
" RHN Proxy system ID does not match an RHN Proxy Server\n"
" in the database. Please contact your designated Red Hat representative\n"
-" or visit https://rhn.redhat.com/help/contact.pxt immediately if "
-"experiencing\n"
-" difficulties with the process of enabling or continued enablement of "
-"this\n"
-" RHN Proxy Server.\n"
+" or visit https://rhn.redhat.com/help/contact.pxt immediately if\n"
+" experiencing difficulties with the process of enabling or continued\n"
+" enablement of this RHN Proxy Server.\n"
" "
msgstr ""
-#: ../common/rhnException.py:215
+#: ../common/rhnException.py:256
msgid "RHN Proxy session token is invalid."
msgstr ""
-#: ../common/rhnException.py:216
+#: ../common/rhnException.py:257
msgid "RHN Proxy session token has expired."
msgstr ""
#. 2000-2999: RHN Satellite specific errors:
-#: ../common/rhnException.py:220
+#: ../common/rhnException.py:261
msgid ""
"\n"
" RHN Satellite user creation is not allowed via rhn_register\n"
@@ -1238,150 +1207,197 @@ msgid ""
" "
msgstr ""
-#: ../common/rhnException.py:225
+#: ../common/rhnException.py:266
msgid ""
"\n"
" RHN Satellite system ID does not match an RHN Satellite Server\n"
" in the database. Please contact your designated Red Hat representative\n"
-" or visit https://rhn.redhat.com/help/contact.pxt immediately if "
-"experiencing\n"
-" difficulties with the process of enabling or continued enablement of "
-"this\n"
-" RHN Satellite Server.\n"
+" or visit https://rhn.redhat.com/help/contact.pxt immediately if\n"
+" experiencing difficulties with the process of enabling or continued\n"
+" enablement of this RHN Satellite Server.\n"
" "
msgstr ""
-#: ../common/rhnException.py:232
+#: ../common/rhnException.py:273
msgid ""
"\n"
" This satellite server is not allowed to access the specified channel\n"
" "
msgstr ""
+#: ../common/rhnException.py:276
+msgid ""
+"\n"
+" This satellite server is not allowed to use Inter Satellite Sync on "
+"this satellite\n"
+" "
+msgstr ""
+
+#: ../common/rhnException.py:279
+msgid ""
+"\n"
+" Inter Satellite Sync is disabled on this satellite.\n"
+" "
+msgstr ""
+
#. Kickstart errors
-#: ../common/rhnException.py:237
+#: ../common/rhnException.py:284
msgid "Access denied to kickstart tree"
msgstr ""
-#: ../common/rhnException.py:238
+#: ../common/rhnException.py:285
msgid "Could not find kickstart file"
msgstr ""
+#: ../common/rhnException.py:286
+msgid ""
+"\n"
+" Kickstart tree would not lint, there are packages\n"
+" missing in the channel\n"
+" "
+msgstr ""
+
#. 3000-3999: XML dumper errors:
-#: ../common/rhnException.py:241
+#: ../common/rhnException.py:292
msgid "Invalid datatype passed"
msgstr ""
-#: ../common/rhnException.py:242
+#: ../common/rhnException.py:293
msgid "Unable to retrieve channel"
msgstr ""
-#: ../common/rhnException.py:243
+#: ../common/rhnException.py:294
msgid "Invalid package name"
msgstr ""
-#: ../common/rhnException.py:244
+#: ../common/rhnException.py:295
msgid "Unable to retrieve package"
msgstr ""
-#: ../common/rhnException.py:245
+#: ../common/rhnException.py:296
msgid "Invalid erratum name"
msgstr ""
-#: ../common/rhnException.py:246
+#: ../common/rhnException.py:297
msgid "Unable to retrieve erratum"
msgstr ""
-#: ../common/rhnException.py:247
+#: ../common/rhnException.py:298
msgid "Invalid satellite certificate"
msgstr ""
-#: ../common/rhnException.py:248
+#: ../common/rhnException.py:299
msgid "File is missing"
msgstr ""
-#: ../common/rhnException.py:249
+#: ../common/rhnException.py:300
msgid "Function retrieval error"
msgstr ""
-#: ../common/rhnException.py:250
+#: ../common/rhnException.py:301
msgid "Function execution error"
msgstr ""
-#: ../common/rhnException.py:251
+#: ../common/rhnException.py:302
msgid "Missing version string"
msgstr ""
-#: ../common/rhnException.py:252
+#: ../common/rhnException.py:303
msgid "Invalid version string"
msgstr ""
-#: ../common/rhnException.py:253
+#: ../common/rhnException.py:304
msgid "Mismatching versions"
msgstr ""
-#: ../common/rhnException.py:254
+#: ../common/rhnException.py:305
msgid "Invalid channel version"
msgstr ""
+#: ../common/rhnException.py:306
+msgid "Missing snapshot for channels"
+msgstr ""
+
#. 4000 - 4999: config management errors
-#: ../common/rhnException.py:257
+#: ../common/rhnException.py:309
msgid "Configuration action missing"
msgstr ""
-#: ../common/rhnException.py:258
+#: ../common/rhnException.py:310
msgid "File too large"
msgstr ""
-#: ../common/rhnException.py:259
+#: ../common/rhnException.py:311
msgid "File contains binary data"
msgstr ""
-#: ../common/rhnException.py:260
+#: ../common/rhnException.py:312
msgid "Configuration channel is not empty"
msgstr ""
-#: ../common/rhnException.py:261
+#: ../common/rhnException.py:313
msgid "Permission error"
msgstr ""
-#: ../common/rhnException.py:262
+#: ../common/rhnException.py:314
msgid "Content missing for configuration file"
msgstr ""
-#: ../common/rhnException.py:263
+#: ../common/rhnException.py:315
msgid "Template delimiters not specified"
msgstr ""
-#: ../common/rhnException.py:264
+#: ../common/rhnException.py:316
msgid "Configuration channel does not exist"
msgstr ""
-#: ../common/rhnException.py:265
+#: ../common/rhnException.py:317
msgid "Configuration channel already exists"
msgstr ""
-#: ../common/rhnException.py:266
+#: ../common/rhnException.py:318
msgid "File missing from configuration channel"
msgstr ""
-#: ../common/rhnException.py:267
+#: ../common/rhnException.py:319
msgid "Different revision of this file is uploaded"
msgstr ""
-#: ../common/rhnException.py:268
+#: ../common/rhnException.py:320
msgid "File already uploaded to configuration channel"
msgstr ""
-#: ../common/rhnException.py:269
+#: ../common/rhnException.py:321
msgid "File size exceeds remaining quota space"
msgstr ""
-#: ../common/rhnException.py:270
+#: ../common/rhnException.py:322
msgid "Full path of file must be specified"
msgstr ""
-#: ../common/rhnException.py:292
+#. 5000 - 5099: entitlement mapper errors
+#: ../common/rhnException.py:325
+msgid "The speicified item is not present in the input"
+msgstr ""
+
+#: ../common/rhnException.py:326
+#, fuzzy
+msgid "Invalid item code"
+msgstr "Invalid system release version requested"
+
+#: ../common/rhnException.py:327
+msgid "Invalid user role"
+msgstr ""
+
+#: ../common/rhnException.py:328
+msgid "Invalid server group"
+msgstr ""
+
+#: ../common/rhnException.py:329
+msgid "Invalid channel family"
+msgstr ""
+
+#: ../common/rhnException.py:373
msgid ""
"\n"
" An error has occurred while processing your request. If this problem\n"
@@ -1391,24 +1407,28 @@ msgid ""
" details on how to reproduce this problem.\n"
msgstr ""
-#: ../common/rhnException.py:336
+#: ../common/rhnException.py:427
#, python-format
msgid ""
"Error Message:\n"
" %s\n"
msgstr ""
-#: ../common/rhnException.py:338
+#: ../common/rhnException.py:429
#, python-format
msgid "Error Class Code: %s\n"
msgstr ""
-#: ../common/rhnException.py:340
+#: ../common/rhnException.py:431
#, python-format
msgid "Error Class Info: %s\n"
msgstr ""
-#: ../common/rhnException.py:342
+#: ../common/rhnException.py:434
#, python-format
msgid "Explanation: %s"
msgstr ""
+
+#, fuzzy
+#~ msgid "Invalid system registration token"
+#~ msgstr "Invalid system release version requested"
diff --git a/backend/po/ro.po b/backend/po/ro.po
index 7134f14..f060ed5 100644
--- a/backend/po/ro.po
+++ b/backend/po/ro.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: RHN 2.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-02-28 19:31-0500\n"
+"POT-Creation-Date: 2009-12-11 14:15+0100\n"
"PO-Revision-Date: 2000-08-08 16:51-0400\n"
"Last-Translator: Mihai Ibanescu <misa(a)redhat.com>\n"
"Language-Team: Romanian <rhns-i18n(a)redhat.com>\n"
@@ -15,714 +15,636 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../server/apacheAuth.py:44
+#: ../server/handlers/xmlrpc/queue.py:353
#, python-format
-msgid "incomplete proxy authentication token: %s"
+msgid "Invalid action value type %s (%s)"
msgstr ""
-#: ../server/apacheAuth.py:60
+#: ../server/handlers/xmlrpc/queue.py:378
#, python-format
-msgid "Sent proxy signature %s does not match ours %s."
+msgid "Action %s does not belong to server %s"
msgstr ""
-#: ../server/apacheAuth.py:91
-msgid "declined proxy authentication"
+#: ../server/handlers/xmlrpc/proxy.py:55
+#, python-format
+msgid "RHN Proxy service not enabled for server profile: \"%s\""
msgstr ""
-#: ../server/applet/applet.py:56
-msgid "Your system was not found in the RHN database"
+#: ../server/handlers/xmlrpc/proxy.py:74
+msgid "Invalid session key"
msgstr ""
-#: ../server/apacheRequest.py:34
-#, python-format
-msgid "Invalid request received (%s)."
+#: ../server/handlers/xmlrpc/proxy.py:82
+msgid "This server ID no longer exists"
msgstr ""
-#: ../server/apacheRequest.py:92
+#: ../server/handlers/xmlrpc/errata.py:55
#, python-format
-msgid ""
-"IMPORTANT MESSAGE FOLLOWS:\n"
-"%s"
+msgid "Expected a package name, not: %s"
msgstr ""
-#: ../server/apacheRequest.py:117
+#: ../server/handlers/xmlrpc/errata.py:115
#, python-format
-msgid ""
-"While running '%s': caught\n"
-"%s : %s\n"
+msgid "Expected a package, not: %s"
msgstr ""
-#: ../server/apacheRequest.py:499 ../server/redhat_xmlrpc/get_handler.py:32
+#: ../server/handlers/xmlrpc/up2date.py:244
#, python-format
-msgid "Invalid URI %s"
+msgid "Invalid value %s (type %s)"
msgstr ""
-#: ../server/sat/get_handler.py:64
-msgid "Invalid argument"
+#: ../server/handlers/xmlrpc/up2date.py:272
+#, python-format
+msgid "Unable to retrieve package header %s"
msgstr ""
-#: ../server/sat/get_handler.py:89 ../server/sat/kickstart.py:65
+#: ../server/handlers/xmlrpc/up2date.py:438
+#: ../server/handlers/xmlrpc/up2date.py:469
+#: ../server/handlers/xmlrpc/up2date.py:501
#, python-format
-msgid "Kickstart file %s not found in tree %s"
+msgid "Invalid value %s (%s)"
msgstr ""
-#: ../server/sat/get_handler.py:100 ../server/sat/kickstart.py:74
+#: ../server/handlers/xmlrpc/up2date.py:540 ../server/rhnSQL/sql_lib.py:81
#, python-format
-msgid "Kickstart file %s (tree %s) not found on the disk"
+msgid "Invalid value for %s in package tuple: %s (%s)"
msgstr ""
-#: ../server/sat/auth.py:28
+#: ../server/handlers/xmlrpc/up2date.py:552 ../server/rhnSQL/sql_lib.py:93
#, python-format
-msgid "RHN Management Satellite service not enabled for server profile: \"%s\""
+msgid "Invalid package parameter %s (%s)"
msgstr ""
-#: ../server/sat/kickstart.py:44
-#, python-format
-msgid "Kickstart tree %s not accessible"
+#: ../server/handlers/xmlrpc/registration.py:167
+msgid "Required data missing"
msgstr ""
-#: ../server/sat/rhnPackage.py:79 ../server/sat/rhnPackage.py:83
-#: ../server/sat/rhnPackage.py:119 ../server/sat/rhnPackage.py:123
-#: ../server/rhnPackage.py:30 ../server/rhnPackage.py:65
-#: ../server/rhnPackage.py:79 ../server/rhnPackage.py:147
-#: ../server/rhnPackage.py:151 ../server/rhnPackage.py:169
-#: ../server/rhnPackage.py:174 ../server/rhnPackage.py:262
-#: ../server/rhnPackage.py:328 ../server/redhat_xmlrpc/get_handler.py:83
-#, python-format
-msgid "Invalid RPM package %s requested"
+#: ../server/handlers/xmlrpc/registration.py:171
+msgid "Required members missing"
msgstr ""
-#: ../server/sat/rhnPackage.py:87 ../server/sat/rhnPackage.py:127
-#: ../server/rhnPackage.py:84 ../server/rhnPackage.py:157
-#: ../server/rhnPackage.py:180 ../server/rhnPackage.py:268
-#: ../server/rhnPackage.py:334 ../server/redhat_xmlrpc/get_handler.py:105
-msgid "Package not found"
+#: ../server/handlers/xmlrpc/registration.py:180
+msgid "Attempt to register a system to an invalid username"
msgstr ""
-#: ../server/sat/rhnRepository.py:32
-#, python-format
-msgid "Package does not exist or unauthorized to retrieve it %s"
+#: ../server/handlers/xmlrpc/registration.py:847
+msgid "Invalid system release version requested"
msgstr ""
-#: ../server/rhnSQL/sql_lib.py:67 ../server/xmlrpc/up2date.py:523
-#, python-format
-msgid "Invalid value for %s in package tuple: %s (%s)"
+#: ../server/handlers/xmlrpc/registration.py:1035
+msgid "Red Hat Network Welcome Message"
msgstr ""
+"Bine aţi venit în programul de subscriere şi înregistrare pentru\n"
+"serviciul Red Hat Network.\n"
+"\n"
+"Urmeazã mesaj de completat în limba românã."
-#: ../server/rhnSQL/sql_lib.py:79 ../server/xmlrpc/up2date.py:535
+#: ../server/handlers/xmlrpc/registration.py:1045
+msgid "Red Hat Network Privacy Statement"
+msgstr ""
+
+#: ../server/handlers/xmlrpc/registration.py:1064
+msgid "Expected a dictionary as a product argument"
+msgstr ""
+
+#: ../server/handlers/xmlrpc/registration.py:1096
+#: ../server/handlers/xmlrpc/registration.py:1169
#, python-format
-msgid "Invalid package parameter %s (%s)"
+msgid "Not a valid Country: %s"
msgstr ""
-#. nope, not reserved either
-#: ../server/rhnUser.py:490
+#: ../server/handlers/xmlrpc/registration.py:1391
#, python-format
-msgid "Username `%s' has not been reserved"
+msgid "Insufficient subscription permissions for release, arch (%s, %s)"
msgstr ""
-#. New accounts have to specify an e-mail address
-#: ../server/rhnUser.py:496
-msgid "E-mail address not specified"
+#: ../server/handlers/xmlrpc/registration.py:1408
+#, python-format
+msgid "Invalid value '%s' for %s (%s)"
msgstr ""
-#. wrong organization
-#. Invalid org password
-#: ../server/rhnUser.py:551 ../server/rhnUser.py:555
-msgid "Invalid Organization Credentials"
+#: ../server/handlers/sat/auth.py:41
+msgid "ISS is disabled on this satellite."
msgstr ""
-#: ../server/rhnUser.py:561
+#: ../server/handlers/sat/auth.py:53
#, python-format
-msgid "User `%s' not a member of organization %s"
+msgid "Server \"%s\" is not enabled for ISS."
msgstr ""
-#: ../server/rhnUser.py:589
-#, python-format
-msgid "username should be at least %d characters"
+#: ../server/handlers/applet/applet.py:65
+msgid "Your system was not found in the RHN database"
msgstr ""
-#: ../server/rhnUser.py:600
+#: ../server/rhnChannel.py:2119
#, python-format
-msgid "username = `%s', invalid character `%s'"
+msgid ""
+"Your account does not have access to any channels matching (release='%"
+"(release)s', arch='%(arch)s')%(www_activation)s"
msgstr ""
-#: ../server/rhnUser.py:618
+#: ../server/rhnChannel.py:2129
+msgid ""
+"\n"
+"If you have a registration number, please register with it first at http://"
+"www.redhat.com/apps/activate/ and then try again.\n"
+"\n"
+msgstr ""
+
+#: ../server/rhnChannel.py:2139
#, python-format
-msgid "Please limit your e-mail address to %s chars"
+msgid "Insufficient subscription permissions for release (%s, %s"
+msgstr ""
+
+#. Various messages that can be reused
+#.
+#. bretm 02/07/2007 -- when we have better old-client documentation, probably
+#. will be safe to get rid of all this crap
+#: ../server/rhnChannel.py:2410 ../server/rhnChannel.py:2421
+#: ../server/rhnChannel.py:2436 ../server/rhnChannel.py:2444
+msgid "System Registered but Inactive"
msgstr ""
-#: ../server/rhnUser.py:635
+#: ../server/rhnChannel.py:2411
#, python-format
msgid ""
-"A user with the supplied e-mail address (%s)\n"
-" is already registered with Red Hat Network"
+"\n"
+"Invalid Architecture and OS release combination (%s, %s).\n"
+"Your system has been registered, but will not receive updates \n"
+"because it is not subscribed to a channel. If you have not yet\n"
+"activated your product for service, please visit our website at:\n"
+" \n"
+" http://www.redhat.com/apps/activate/\n"
+"\n"
+"...to activate your product."
msgstr ""
-#: ../server/rhnUser.py:704
+#: ../server/rhnChannel.py:2422
#, python-format
-msgid "password must be at least %d characters"
+msgid ""
+"\n"
+"Invalid Architecture and OS release combination (%s, %s).\n"
+"Your system has been registered, but will not receive updates\n"
+"because it could not be subscribed to a base channel.\n"
+"Please contact your organization administrator for assistance.\n"
msgstr ""
-#: ../server/rhnUser.py:721
+#: ../server/rhnChannel.py:2429
#, python-format
-msgid "password contains character `%s'"
+msgid ""
+"\n"
+" This system has been successfully registered, but is not yet entitled\n"
+" to service. To entitle this system to service, login to the web site at:\n"
+"\n"
+" %(entitlement_url)s\n"
msgstr ""
-#: ../server/rhnUser.py:728
+#: ../server/rhnChannel.py:2437
#, python-format
-msgid "username should be at least %d characters long"
+msgid ""
+"\n"
+" This system has been successfully registered, but no service entitlements\n"
+" were available. To entitle this system to service, login to the web site "
+"at:\n"
+"\n"
+" %(entitlement_url)s\n"
msgstr ""
-#: ../server/rhnUser.py:739
-#, python-format
-msgid "Cannot register usernames ending with %s"
+#: ../server/rhnChannel.py:2445
+msgid ""
+"\n"
+" This system has been successfully registered, but the channel "
+"subscriptions\n"
+" were exhausted\n"
msgstr ""
-#: ../server/importlib/userAuth.py:71 ../server/importlib/userAuth.py:75
+#: ../server/importlib/userAuth.py:90 ../server/importlib/userAuth.py:94
msgid "You are not authorized to manage packages in the null org"
msgstr ""
-#: ../server/importlib/userAuth.py:82
+#: ../server/importlib/userAuth.py:101
#, python-format
msgid "You are not allowed to manage packages in the %s org"
msgstr ""
-#: ../server/importlib/userAuth.py:100
+#: ../server/importlib/userAuth.py:119
msgid "You are not allowed to perform administrative tasks"
msgstr ""
-#: ../server/importlib/userAuth.py:127
+#: ../server/importlib/userAuth.py:146
#, python-format
msgid ""
"You are not allowed to manage channel %s, or that channel does not exist"
msgstr ""
-#: ../server/importlib/userAuth.py:181
+#: ../server/importlib/userAuth.py:237
#, python-format
msgid "Channel %s does not exist "
msgstr ""
-#: ../server/rhnServer/server_token.py:67
+#: ../server/apacheAuth.py:55
+#, python-format
+msgid "incomplete proxy authentication token: %s"
+msgstr ""
+
+#: ../server/apacheAuth.py:71
+#, python-format
+msgid "Sent proxy signature %s does not match ours %s."
+msgstr ""
+
+#: ../server/apacheAuth.py:102
+msgid "declined proxy authentication"
+msgstr ""
+
+#. ignore ORA-20277: (product_no_service)
+#: ../server/rhnServer/server_lib.py:66
+msgid "Attempt to register a system failed"
+msgstr ""
+
+#: ../server/rhnServer/server_token.py:85
#, python-format
msgid "Token `%s' has more than one base channel assigned"
msgstr ""
-#: ../server/rhnServer/server_token.py:69
+#: ../server/rhnServer/server_token.py:87
msgid "Conflicting base channels"
msgstr ""
-#: ../server/rhnServer/server_token.py:171
+#: ../server/rhnServer/server_token.py:211
#, python-format
msgid "Failed to add server to group %s"
msgstr ""
-#: ../server/rhnServer/server_token.py:452
+#: ../server/rhnServer/server_token.py:511
#, python-format
msgid "Maximum usage count of %s reached"
msgstr ""
-#: ../server/rhnServer/server_token.py:549
+#: ../server/rhnServer/server_token.py:642
+msgid ""
+"Registration failed: RHN Software Management service entitlements exhausted"
+msgstr ""
+
+#: ../server/rhnServer/server_token.py:759
+msgid ""
+"Stacking of re-registration tokens with different base entitlements is not "
+"supported"
+msgstr ""
+
+#: ../server/rhnServer/server_token.py:837
#, python-format
msgid "Could not find token '%s'"
msgstr ""
#. Cannot use activation keys from different orgs
-#: ../server/rhnServer/server_token.py:569
+#: ../server/rhnServer/server_token.py:869
msgid "Tokens from mismatching orgs"
msgstr ""
#. Two tokens with different kickstart sessions
-#: ../server/rhnServer/server_token.py:579
+#: ../server/rhnServer/server_token.py:879
msgid "Kickstart session mismatch"
msgstr ""
-#: ../server/rhnServer/server_token.py:595
+#: ../server/rhnServer/server_token.py:899
+msgid "Stacking of re-registration tokens is not supported"
+msgstr ""
+
+#: ../server/rhnServer/server_class.py:98
#, python-format
-msgid ""
-"Conflicting entitlement levels for tokens:\n"
-"`%s' (%s) and `%s' (%s)"
+msgid "Architecture `%s' is not supported"
msgstr ""
-#: ../server/rhnServer/server_token.py:612
-msgid "Stacking of re-registration tokens is not supported"
+#: ../server/rhnPackage.py:41 ../server/rhnPackage.py:76
+#: ../server/rhnPackage.py:90 ../server/rhnPackage.py:159
+#: ../server/rhnPackage.py:163 ../server/rhnPackage.py:221
+#: ../server/rhnPackage.py:226 ../server/rhnPackage.py:314
+#: ../server/rhnPackage.py:380
+#, python-format
+msgid "Invalid RPM package %s requested"
msgstr ""
-#: ../server/rhnServer/server_token.py:704
-msgid ""
-"Registration failed: RHN Software Management service entitlements exhausted"
+#: ../server/rhnPackage.py:95 ../server/rhnPackage.py:169
+#: ../server/rhnPackage.py:232 ../server/rhnPackage.py:320
+#: ../server/rhnPackage.py:386
+msgid "Package not found"
msgstr ""
-#: ../server/rhnServer/server_class.py:84
+#: ../server/apacheRequest.py:47
#, python-format
-msgid "Architecture `%s' is not supported"
+msgid "Invalid request received (%s)."
msgstr ""
-#. ignore ORA-20277: (product_no_service)
-#: ../server/rhnServer/server_class.py:457
-msgid "Attempt to register a system failed"
+#: ../server/apacheRequest.py:105
+#, python-format
+msgid ""
+"IMPORTANT MESSAGE FOLLOWS:\n"
+"%s"
msgstr ""
-#: ../server/rhnHandler.py:11
+#: ../server/apacheRequest.py:130
#, python-format
msgid ""
-"\n"
-" Your demo account has been disabled. To enable your account, you must \n"
-" verify your email address by visiting:\n"
-"\n"
-" %(email_link)s\n"
-"\n"
-" You may also enable your account by purchasing Red Hat Network service "
-"at:\n"
-"\n"
-" https://rhn.redhat.com/network/sales/index.pxt\n"
-" \n"
-" Your account name: %(login)s\n"
-" Current email on file: %(email)s\n"
+"While running '%s': caught\n"
+"%s : %s\n"
msgstr ""
-#: ../server/rhnHandler.py:25
+#: ../server/apacheRequest.py:556
#, python-format
-msgid ""
-"\n"
-" Your demo account has been disabled. To enable your account, you must\n"
-" fill out the latest Red Hat Network survey by visiting:\n"
-"\n"
-" %(survey_link)s\n"
-"\n"
-" You may also enable your Red Hat Network account by purchasing service "
-"at:\n"
-"\n"
-" https://rhn.redhat.com/network/sales/index.pxt\n"
-"\n"
-" Your account name: %(login)s\n"
+msgid "Invalid URI %s"
msgstr ""
-#: ../server/rhnHandler.py:75
+#: ../server/rhnHandler.py:58
msgid ""
"Please run rhn_register (or up2date --register on Red Hat Enterprise Linux 3 "
"or later)\n"
"as root on this client"
msgstr ""
-#: ../server/rhnHandler.py:97
+#: ../server/rhnHandler.py:77
#, python-format
msgid "Service not enabled for system profile: \"%s\""
msgstr ""
-#: ../server/xmlrpc/queue.py:342
-#, python-format
-msgid "Invalid action value type %s (%s)"
-msgstr ""
-
-#: ../server/xmlrpc/queue.py:367
-#, python-format
-msgid "Action %s does not belong to server %s"
-msgstr ""
-
-#: ../server/xmlrpc/errata.py:44
-#, python-format
-msgid "Expected a package name, not: %s"
-msgstr ""
-
-#: ../server/xmlrpc/errata.py:103
-#, python-format
-msgid "Expected a package, not: %s"
-msgstr ""
-
-#: ../server/xmlrpc/registration.py:157
-msgid "Required data missing"
-msgstr ""
-
-#: ../server/xmlrpc/registration.py:161
-msgid "Required members missing"
-msgstr ""
-
-#: ../server/xmlrpc/registration.py:182
-msgid "Attempt to register a system to an invalid username"
-msgstr ""
-
-#: ../server/xmlrpc/registration.py:351
-msgid "Invalid system release version requested"
-msgstr ""
-
-#: ../server/xmlrpc/registration.py:484
-msgid "Red Hat Network Welcome Message"
-msgstr ""
-"Bine aţi venit în programul de subscriere şi înregistrare pentru\n"
-"serviciul Red Hat Network.\n"
-"\n"
-"Urmeazã mesaj de completat în limba românã."
-
-#: ../server/xmlrpc/registration.py:494
-msgid "Red Hat Network Privacy Statement"
+#: ../server/rhnUser.py:382 ../server/rhnUser.py:385
+msgid "Invalid username/password combination"
msgstr ""
-#: ../server/xmlrpc/registration.py:505
-msgid "Expected a dictionary as a product argument"
-msgstr ""
-
-#: ../server/xmlrpc/registration.py:537 ../server/xmlrpc/registration.py:590
+#: ../server/rhnUser.py:430
#, python-format
-msgid "Not a valid Country: %s"
-msgstr ""
-
-#: ../server/xmlrpc/registration.py:622
msgid ""
"\n"
-" The product registration code can be found on the\n"
-" registration card included with the product"
+" %s Account has been deactivated on this server.\n"
+" Please contact your Org administrator for more help."
msgstr ""
-#. already registered
-#: ../server/xmlrpc/registration.py:627
-msgid ""
-"\n"
-" The code that you have entered has been already\n"
-" registered. Please contact Red Hat Customer Support\n"
-" at http://www.redhat.com/services/tools/installation/\n"
-" "
-msgstr ""
-
-#: ../server/xmlrpc/registration.py:633
+#. nope, not reserved either
+#: ../server/rhnUser.py:548
#, python-format
-msgid ""
-"\n"
-" Invalid product registration number.\n"
-" The product registration code can be found on the\n"
-" registration card included with the product. Please\n"
-" check carefully that you have entered the correct\n"
-" registration number. Invalid: %s"
+msgid "Username `%s' has not been reserved"
msgstr ""
-#: ../server/xmlrpc/registration.py:773
-#, python-format
-msgid "Insufficient subscription permissions for release, arch (%s, %s)"
+#. New accounts have to specify an e-mail address
+#: ../server/rhnUser.py:554
+msgid "E-mail address not specified"
msgstr ""
-#: ../server/xmlrpc/registration.py:788
-#, python-format
-msgid "Invalid value '%s' for %s (%s)"
+#. wrong organization
+#. Invalid org password
+#: ../server/rhnUser.py:609 ../server/rhnUser.py:613
+msgid "Invalid Organization Credentials"
msgstr ""
-#: ../server/xmlrpc/up2date.py:232
+#: ../server/rhnUser.py:619
#, python-format
-msgid "Invalid value %s (type %s)"
+msgid "User `%s' not a member of organization %s"
msgstr ""
-#: ../server/xmlrpc/up2date.py:260
+#: ../server/rhnUser.py:647
#, python-format
-msgid "Unable to retrieve package header %s"
+msgid "username should be at least %d characters"
msgstr ""
-#: ../server/xmlrpc/up2date.py:424 ../server/xmlrpc/up2date.py:454
-#: ../server/xmlrpc/up2date.py:485
+#: ../server/rhnUser.py:650
#, python-format
-msgid "Invalid value %s (%s)"
+msgid "username should be less than %d characters"
msgstr ""
-#: ../server/xmlrpc/proxy.py:46
+#: ../server/rhnUser.py:661
#, python-format
-msgid "RHN Proxy service not enabled for server profile: \"%s\""
-msgstr ""
-
-#: ../server/xmlrpc/proxy.py:65
-msgid "Invalid session key"
-msgstr ""
-
-#: ../server/xmlrpc/proxy.py:73
-msgid "This server ID no longer exists"
+msgid "username = `%s', invalid character `%s'"
msgstr ""
-#: ../server/rhnChannel.py:1565
+#: ../server/rhnUser.py:679
#, python-format
-msgid ""
-"Your account does not have access to any channels matching (release='%"
-"(release)s', arch='%(arch)s')%(www_activation)s"
-msgstr ""
-
-#: ../server/rhnChannel.py:1575
-msgid ""
-"\n"
-"If you have a registration number, please register with it first at http://"
-"www.redhat.com/apps/activate/ and then try again.\n"
-"\n"
+msgid "Please limit your e-mail address to %s chars"
msgstr ""
-#: ../server/rhnChannel.py:1585
+#: ../server/rhnUser.py:698
#, python-format
-msgid "Insufficient subscription permissions for release (%s, %s"
-msgstr ""
-
-#. Various messages that can be reused
-#: ../server/rhnChannel.py:1837 ../server/rhnChannel.py:1847
-#: ../server/rhnChannel.py:1854 ../server/rhnChannel.py:1865
-#: ../server/rhnChannel.py:1880 ../server/rhnChannel.py:1888
-msgid "System Registered but Inactive"
-msgstr ""
-
-#: ../server/rhnChannel.py:1838
msgid ""
-"\n"
-" Your system has been registered, but will not receive updates until \n"
-" your product has been activated. Visit our website at:\n"
-" \n"
-" http://www.redhat.com/now\n"
-"\n"
-" ...to activate your product.\n"
-msgstr ""
-
-#: ../server/rhnChannel.py:1848
-msgid ""
-"\n"
-" Your system has been registered, but will not receive updates because\n"
-" it could not be subscribed to a base channel. Please contact your\n"
-" organization administrator for assistance.\n"
+"A user with the supplied e-mail address (%s)\n"
+" is already registered with Red Hat Network"
msgstr ""
-#: ../server/rhnChannel.py:1855
+#: ../server/rhnUser.py:767
#, python-format
-msgid ""
-"\n"
-"Invalid Architecture and OS release combination (%s, %s).\n"
-"Your system has been registered, but will not receive updates \n"
-"because it is not subscribed to a channel. If you have not yet\n"
-"activated your product for service, please visit our website at:\n"
-" \n"
-" http://www.redhat.com/now\n"
-"\n"
-"...to activate your product."
+msgid "password must be at least %d characters"
msgstr ""
-#: ../server/rhnChannel.py:1866
+#: ../server/rhnUser.py:770
#, python-format
-msgid ""
-"\n"
-"Invalid Architecture and OS release combination (%s, %s).\n"
-"Your system has been registered, but will not receive updates\n"
-"because it could not be subscribed to a base channel.\n"
-"Please contact your organization administrator for assistance.\n"
+msgid "Password must be shorter than %d characters"
msgstr ""
-#: ../server/rhnChannel.py:1873
+#: ../server/rhnUser.py:788
#, python-format
-msgid ""
-"\n"
-" This system has been successfully registered, but is not yet entitled\n"
-" to service. To entitle this system to service, login to the web site at:\n"
-"\n"
-" %(entitlement_url)s\n"
+msgid "password contains character `%s'"
msgstr ""
-#: ../server/rhnChannel.py:1881
+#: ../server/rhnUser.py:795
#, python-format
-msgid ""
-"\n"
-" This system has been successfully registered, but no service entitlements\n"
-" were available. To entitle this system to service, login to the web site "
-"at:\n"
-"\n"
-" %(entitlement_url)s\n"
+msgid "username should be at least %d characters long"
msgstr ""
-#: ../server/rhnChannel.py:1889
-msgid ""
-"\n"
-" This system has been successfully registered, but the channel "
-"subscriptions\n"
-" were exhausted\n"
+#: ../server/rhnUser.py:806
+#, python-format
+msgid "Cannot register usernames ending with %s"
msgstr ""
-#: ../common/rhnException.py:28
+#: ../common/rhnException.py:43
msgid "Outage mode"
msgstr ""
#. 0-999: RHN client/client-like interaction errors:
-#: ../common/rhnException.py:30
+#: ../common/rhnException.py:45
msgid "This does not appear to be a valid username."
msgstr ""
-#: ../common/rhnException.py:31
+#: ../common/rhnException.py:46
msgid "Invalid username and password combination."
msgstr ""
-#: ../common/rhnException.py:32
-msgid "This username is already taken, or the password is incorrect."
+#: ../common/rhnException.py:47
+msgid "This login is already taken, or the password is incorrect."
msgstr ""
-#: ../common/rhnException.py:33
+#: ../common/rhnException.py:48
msgid "Permission denied."
msgstr ""
-#: ../common/rhnException.py:34
+#: ../common/rhnException.py:49
msgid "Can not create new entry."
msgstr ""
-#: ../common/rhnException.py:35
+#: ../common/rhnException.py:50
msgid "Object not found."
msgstr ""
-#: ../common/rhnException.py:36
+#: ../common/rhnException.py:51
msgid "Account limits exceeded."
msgstr ""
-#: ../common/rhnException.py:37
+#: ../common/rhnException.py:52
msgid "Invalid System Digital ID."
msgstr ""
-#: ../common/rhnException.py:38
+#: ../common/rhnException.py:53
msgid "Invalid System Credentials."
msgstr ""
-#: ../common/rhnException.py:39
+#: ../common/rhnException.py:54
msgid "Could not retrieve user data from database."
msgstr ""
-#: ../common/rhnException.py:40
+#: ../common/rhnException.py:55
msgid "Valid username required."
msgstr ""
-#: ../common/rhnException.py:41
+#: ../common/rhnException.py:56
msgid "Valid password required."
msgstr ""
-#: ../common/rhnException.py:42
+#: ../common/rhnException.py:57
msgid "Minimum username length violation."
msgstr ""
-#: ../common/rhnException.py:43
+#: ../common/rhnException.py:58
msgid "Minimum password length violation."
msgstr ""
-#: ../common/rhnException.py:44
+#: ../common/rhnException.py:59
msgid "The username contains invalid characters."
msgstr ""
-#: ../common/rhnException.py:45
+#: ../common/rhnException.py:60
msgid "Invalid product registration code."
msgstr ""
-#: ../common/rhnException.py:46
+#: ../common/rhnException.py:61
msgid "File not found."
msgstr ""
-#: ../common/rhnException.py:47
+#: ../common/rhnException.py:62
msgid "Invalid Architecture and OS release combination."
msgstr ""
-#: ../common/rhnException.py:48
+#: ../common/rhnException.py:63
msgid "Architecture and OS version combination is not supported."
msgstr ""
-#: ../common/rhnException.py:49
+#: ../common/rhnException.py:64
msgid "Could not retrieve system data from database."
msgstr ""
-#: ../common/rhnException.py:50
+#: ../common/rhnException.py:65
msgid "Invalid arguments passed to function."
msgstr ""
-#: ../common/rhnException.py:51
+#: ../common/rhnException.py:66
msgid "Unable to retrieve requested entry."
msgstr ""
-#: ../common/rhnException.py:52
+#: ../common/rhnException.py:67
msgid "Could not update database entry."
msgstr ""
-#: ../common/rhnException.py:53
+#: ../common/rhnException.py:68
msgid "Unsupported server architecture."
msgstr ""
-#: ../common/rhnException.py:54
+#: ../common/rhnException.py:69
msgid "LDAP operation failed."
msgstr ""
-#: ../common/rhnException.py:55
+#: ../common/rhnException.py:70
msgid "Backend RPM database failure: can not retrieve requested information."
msgstr ""
-#: ../common/rhnException.py:56
+#: ../common/rhnException.py:72
msgid "Server Entry is busy."
msgstr ""
-#: ../common/rhnException.py:57
+#: ../common/rhnException.py:73
#, python-format
msgid ""
"\n"
" The anonymous server functionality is no longer available.\n"
"\n"
-" Please re-register this system by running rhn_register \n"
+" Please re-register this system by running rhn_register\n"
" (or up2date --register on Red Hat Enterprise Linux 3+) as root.\n"
" Please visit https://%(hostname)s/rhn/systems/SystemEntitlements.do\n"
-" or login at https://%(hostname)s, and from the \"Systems\" tab,\n"
-" select \"System Entitlements\" to enable RHN service for this system.\n"
+" or login at https://%(hostname)s, and from the \"Overview\" tab,\n"
+" select \"Subscription Management\" to enable RHN service for this "
+"system.\n"
" "
msgstr ""
-#: ../common/rhnException.py:66
+#: ../common/rhnException.py:82
msgid "Record not available in the database."
msgstr ""
-#: ../common/rhnException.py:67
+#: ../common/rhnException.py:83
msgid "Invalid value for entry."
msgstr ""
-#: ../common/rhnException.py:68
+#: ../common/rhnException.py:84
#, python-format
msgid ""
"\n"
" This system does not have a valid entitlement for Red Hat Network.\n"
" Please visit https://%(hostname)s/rhn/systems/SystemEntitlements.do\n"
-" or login at https://%(hostname)s, and from the \"Systems\" tab,\n"
-" select \"System Entitlements\" to enable RHN service for this system.\n"
+" or login at https://%(hostname)s, and from the \"Overview\" tab,\n"
+" select \"Subscription Management\" to enable RHN service for this "
+"system.\n"
" "
msgstr ""
-#: ../common/rhnException.py:74
+#: ../common/rhnException.py:90
msgid "Channel error"
msgstr ""
-#: ../common/rhnException.py:75
+#: ../common/rhnException.py:91
msgid "Client session token is invalid."
msgstr ""
-#: ../common/rhnException.py:76
+#: ../common/rhnException.py:92
msgid "Client session token has expired."
msgstr ""
-#: ../common/rhnException.py:77
+#: ../common/rhnException.py:93
msgid "You are not authorized to retrieve the requested object."
msgstr ""
-#: ../common/rhnException.py:78
+#: ../common/rhnException.py:94
msgid "Invalid action"
msgstr ""
-#: ../common/rhnException.py:79
+#: ../common/rhnException.py:95
msgid "You are not allowed to perform administrative tasks on this system."
msgstr ""
-#: ../common/rhnException.py:80
+#: ../common/rhnException.py:97
msgid "The system is already subscribed to the specified channel."
msgstr ""
-#: ../common/rhnException.py:81
+#: ../common/rhnException.py:98
msgid "The system is not currently subscribed to the specified channel."
msgstr ""
-#: ../common/rhnException.py:82
+#: ../common/rhnException.py:99
msgid "The specified channel does not exist."
msgstr ""
-#: ../common/rhnException.py:83
+#: ../common/rhnException.py:100
msgid "Invalid channel version."
msgstr ""
-#: ../common/rhnException.py:84
+#: ../common/rhnException.py:101
msgid "Invalid ORG_ID requested"
msgstr ""
-#: ../common/rhnException.py:85
+#: ../common/rhnException.py:102
msgid ""
"\n"
" User group membership limits exceeded.\n"
@@ -736,7 +658,7 @@ msgid ""
" "
msgstr ""
-#: ../common/rhnException.py:93
+#: ../common/rhnException.py:110
msgid ""
"\n"
" System group membership limits exceeded.\n"
@@ -750,7 +672,7 @@ msgid ""
" "
msgstr ""
-#: ../common/rhnException.py:101
+#: ../common/rhnException.py:118
msgid ""
"\n"
" Invalid architecture.\n"
@@ -759,7 +681,7 @@ msgid ""
" "
msgstr ""
-#: ../common/rhnException.py:106
+#: ../common/rhnException.py:123
msgid ""
"\n"
" Incompatible architectures.\n"
@@ -769,11 +691,11 @@ msgid ""
" "
msgstr ""
-#: ../common/rhnException.py:112
+#: ../common/rhnException.py:129
msgid "Invalid RPM header"
msgstr ""
-#: ../common/rhnException.py:113
+#: ../common/rhnException.py:130
msgid ""
"\n"
" Invalid channel.\n"
@@ -782,7 +704,7 @@ msgid ""
" "
msgstr ""
-#: ../common/rhnException.py:118
+#: ../common/rhnException.py:135
#, python-format
msgid ""
"\n"
@@ -803,22 +725,22 @@ msgid ""
msgstr ""
#. For the uploading tools
-#: ../common/rhnException.py:134
+#: ../common/rhnException.py:151
msgid "Invalid information uploaded to the server"
msgstr ""
-#: ../common/rhnException.py:135
+#: ../common/rhnException.py:152
#, python-format
msgid ""
"\n"
" Demo service currently disabled due to high load. If you would like\n"
-" to see Red Hat's policies on Demo service, or find out how you can \n"
-" purchase a subscription service and receive priority download access, \n"
+" to see Red Hat's policies on Demo service, or find out how you can\n"
+" purchase a subscription service and receive priority download access,\n"
" please go to http://%(hostname)s/preview/index.pxt\n"
" "
msgstr ""
-#: ../common/rhnException.py:141
+#: ../common/rhnException.py:158
#, python-format
msgid ""
"\n"
@@ -830,29 +752,50 @@ msgid ""
" "
msgstr ""
-#: ../common/rhnException.py:147
+#: ../common/rhnException.py:164
msgid "Error uploading network interfaces configuration."
msgstr ""
+#: ../common/rhnException.py:165
+msgid ""
+"\n"
+" Package Upload Failed due to uniqueness constraint violation.\n"
+" Make sure the package does not have any duplicate dependencies or\n"
+" does not already exists on the server\n"
+" "
+msgstr ""
+
+#: ../common/rhnException.py:170
+msgid ""
+"\n"
+" The --force rhnpush option is disabled on this server. \n"
+" Please contact your Satellite administrator for more help.\n"
+" "
+msgstr ""
+
#. 60-70: token errors
-#: ../common/rhnException.py:150
-msgid "Invalid system registration token"
+#: ../common/rhnException.py:176
+msgid ""
+"\n"
+" The activation token specified could not be found on the server.\n"
+" Please retry with a valid key.\n"
+" "
msgstr ""
-#: ../common/rhnException.py:151
+#: ../common/rhnException.py:180
msgid "Too many systems registered using this registration token"
msgstr ""
-#: ../common/rhnException.py:152
+#: ../common/rhnException.py:181
msgid "Token contains invalid, obsoleted or insufficient settings"
msgstr ""
-#: ../common/rhnException.py:153
+#: ../common/rhnException.py:182
msgid "Conflicting activation tokens"
msgstr ""
#. 70-80: channel subscription errors
-#: ../common/rhnException.py:156
+#: ../common/rhnException.py:185
msgid ""
"\n"
" All available subscriptions for the requested channel have been "
@@ -861,143 +804,170 @@ msgid ""
" "
msgstr ""
-#: ../common/rhnException.py:160
+#: ../common/rhnException.py:189
msgid ""
"\n"
" You do not have subscription permission to the designated channel.\n"
-" Please refer to your organization's channel or organization "
-"administrators for\n"
-" further details.\n"
+" Please refer to your organization's channel or organization\n"
+" administrators for further details.\n"
" "
msgstr ""
+#: ../common/rhnException.py:194
+msgid "You can not unsubscribe from base channel."
+msgstr ""
+
#. 80-90: server group errors
-#: ../common/rhnException.py:167
+#: ../common/rhnException.py:197
msgid "There was an error while trying to join the system to its groups"
msgstr ""
#. 90-100: entitlement errors
-#: ../common/rhnException.py:170
+#: ../common/rhnException.py:200
msgid "Unable to entitle system"
msgstr ""
-#: ../common/rhnException.py:171
+#: ../common/rhnException.py:201
msgid ""
"Registration token unable to entitle system: maximum membership exceeded"
msgstr ""
#. 100-109: e-mail and uuid related faults
-#: ../common/rhnException.py:174
+#: ../common/rhnException.py:205
msgid "Maximum e-mail length violation."
msgstr ""
-#: ../common/rhnException.py:175
+#: ../common/rhnException.py:206
msgid "Changing e-mail address is not supported."
msgstr ""
-#: ../common/rhnException.py:176
+#: ../common/rhnException.py:207
msgid "Unique e-mail address check failed."
msgstr ""
-#: ../common/rhnException.py:177
+#: ../common/rhnException.py:208
msgid "This system has been previously registered."
msgstr ""
-#: ../common/rhnException.py:178
+#: ../common/rhnException.py:209
msgid "Invalid username"
msgstr ""
#. 110-129: disabled org errors
-#: ../common/rhnException.py:181
+#: ../common/rhnException.py:212
msgid "Service for your account has been disabled."
msgstr ""
-#: ../common/rhnException.py:182
+#: ../common/rhnException.py:213
msgid "Email address not validated; service disabled"
msgstr ""
-#: ../common/rhnException.py:183
+#: ../common/rhnException.py:214
msgid "Survey not filled out; service disabled"
msgstr ""
#. 130-140: bugzilla errata import errors
-#: ../common/rhnException.py:186
+#: ../common/rhnException.py:217
msgid "Bugzilla erratum import error"
msgstr ""
#. 140-159 applet errors
-#: ../common/rhnException.py:189
+#: ../common/rhnException.py:220
msgid "Unable to look up server"
msgstr ""
#. 160-179: OSAD errors
-#: ../common/rhnException.py:192
+#: ../common/rhnException.py:223
msgid "Required argument is missing"
msgstr ""
#. 500-599: Package Uploader errors
-#: ../common/rhnException.py:195
+#: ../common/rhnException.py:226
msgid "Missing HTTP header information"
msgstr ""
-#: ../common/rhnException.py:196
-msgid "The package's md5sum signature does not match the header one"
+#: ../common/rhnException.py:227
+msgid "The package's checksum signature does not match the header one"
msgstr ""
-#: ../common/rhnException.py:197
+#: ../common/rhnException.py:228
msgid "Header information does not match package metainformation"
msgstr ""
-#: ../common/rhnException.py:198
+#: ../common/rhnException.py:229
msgid "Package with a different signature already uploaded"
msgstr ""
-#: ../common/rhnException.py:199
+#: ../common/rhnException.py:230
msgid "Not an RPM package"
msgstr ""
-#: ../common/rhnException.py:200
+#: ../common/rhnException.py:231
msgid "Unsigned RPM package"
msgstr ""
-#: ../common/rhnException.py:201
+#: ../common/rhnException.py:232
msgid "Incompatible package and channel architectures"
msgstr ""
+#: ../common/rhnException.py:233
+msgid "Incompatible checksum type"
+msgstr ""
+
+#. 600-699: RHEL5+ EN errors
+#: ../common/rhnException.py:236
+msgid "Invalid Entitlement Number"
+msgstr ""
+
+#: ../common/rhnException.py:237
+msgid "No entitlement information tied to hardware"
+msgstr ""
+
+#: ../common/rhnException.py:238
+msgid "Installation number is not entitling"
+msgstr ""
+
+#. 700-799: Additional user input verification errors.
+#: ../common/rhnException.py:241
+msgid "Maximum username length violation"
+msgstr ""
+
+#: ../common/rhnException.py:242
+msgid "Maximum password length violation"
+msgstr ""
+
#. 1000-1999: RHN Proxy specific errors:
#. issued by an RHN Proxy to the client
-#: ../common/rhnException.py:205
+#: ../common/rhnException.py:246
msgid "RHN Proxy error."
msgstr ""
-#: ../common/rhnException.py:206
+#: ../common/rhnException.py:247
msgid "RHN Proxy unable to login."
msgstr ""
#. issued by an RHN Server/Satellite to the proxy
-#: ../common/rhnException.py:208
+#: ../common/rhnException.py:249
msgid ""
"\n"
" RHN Proxy system ID does not match an RHN Proxy Server\n"
" in the database. Please contact your designated Red Hat representative\n"
-" or visit https://rhn.redhat.com/help/contact.pxt immediately if "
-"experiencing\n"
-" difficulties with the process of enabling or continued enablement of "
-"this\n"
-" RHN Proxy Server.\n"
+" or visit https://rhn.redhat.com/help/contact.pxt immediately if\n"
+" experiencing difficulties with the process of enabling or continued\n"
+" enablement of this RHN Proxy Server.\n"
" "
msgstr ""
-#: ../common/rhnException.py:215
+#: ../common/rhnException.py:256
msgid "RHN Proxy session token is invalid."
msgstr ""
-#: ../common/rhnException.py:216
+#: ../common/rhnException.py:257
msgid "RHN Proxy session token has expired."
msgstr ""
#. 2000-2999: RHN Satellite specific errors:
-#: ../common/rhnException.py:220
+#: ../common/rhnException.py:261
msgid ""
"\n"
" RHN Satellite user creation is not allowed via rhn_register\n"
@@ -1006,150 +976,196 @@ msgid ""
" "
msgstr ""
-#: ../common/rhnException.py:225
+#: ../common/rhnException.py:266
msgid ""
"\n"
" RHN Satellite system ID does not match an RHN Satellite Server\n"
" in the database. Please contact your designated Red Hat representative\n"
-" or visit https://rhn.redhat.com/help/contact.pxt immediately if "
-"experiencing\n"
-" difficulties with the process of enabling or continued enablement of "
-"this\n"
-" RHN Satellite Server.\n"
+" or visit https://rhn.redhat.com/help/contact.pxt immediately if\n"
+" experiencing difficulties with the process of enabling or continued\n"
+" enablement of this RHN Satellite Server.\n"
" "
msgstr ""
-#: ../common/rhnException.py:232
+#: ../common/rhnException.py:273
msgid ""
"\n"
" This satellite server is not allowed to access the specified channel\n"
" "
msgstr ""
+#: ../common/rhnException.py:276
+msgid ""
+"\n"
+" This satellite server is not allowed to use Inter Satellite Sync on "
+"this satellite\n"
+" "
+msgstr ""
+
+#: ../common/rhnException.py:279
+msgid ""
+"\n"
+" Inter Satellite Sync is disabled on this satellite.\n"
+" "
+msgstr ""
+
#. Kickstart errors
-#: ../common/rhnException.py:237
+#: ../common/rhnException.py:284
msgid "Access denied to kickstart tree"
msgstr ""
-#: ../common/rhnException.py:238
+#: ../common/rhnException.py:285
msgid "Could not find kickstart file"
msgstr ""
+#: ../common/rhnException.py:286
+msgid ""
+"\n"
+" Kickstart tree would not lint, there are packages\n"
+" missing in the channel\n"
+" "
+msgstr ""
+
#. 3000-3999: XML dumper errors:
-#: ../common/rhnException.py:241
+#: ../common/rhnException.py:292
msgid "Invalid datatype passed"
msgstr ""
-#: ../common/rhnException.py:242
+#: ../common/rhnException.py:293
msgid "Unable to retrieve channel"
msgstr ""
-#: ../common/rhnException.py:243
+#: ../common/rhnException.py:294
msgid "Invalid package name"
msgstr ""
-#: ../common/rhnException.py:244
+#: ../common/rhnException.py:295
msgid "Unable to retrieve package"
msgstr ""
-#: ../common/rhnException.py:245
+#: ../common/rhnException.py:296
msgid "Invalid erratum name"
msgstr ""
-#: ../common/rhnException.py:246
+#: ../common/rhnException.py:297
msgid "Unable to retrieve erratum"
msgstr ""
-#: ../common/rhnException.py:247
+#: ../common/rhnException.py:298
msgid "Invalid satellite certificate"
msgstr ""
-#: ../common/rhnException.py:248
+#: ../common/rhnException.py:299
msgid "File is missing"
msgstr ""
-#: ../common/rhnException.py:249
+#: ../common/rhnException.py:300
msgid "Function retrieval error"
msgstr ""
-#: ../common/rhnException.py:250
+#: ../common/rhnException.py:301
msgid "Function execution error"
msgstr ""
-#: ../common/rhnException.py:251
+#: ../common/rhnException.py:302
msgid "Missing version string"
msgstr ""
-#: ../common/rhnException.py:252
+#: ../common/rhnException.py:303
msgid "Invalid version string"
msgstr ""
-#: ../common/rhnException.py:253
+#: ../common/rhnException.py:304
msgid "Mismatching versions"
msgstr ""
-#: ../common/rhnException.py:254
+#: ../common/rhnException.py:305
msgid "Invalid channel version"
msgstr ""
+#: ../common/rhnException.py:306
+msgid "Missing snapshot for channels"
+msgstr ""
+
#. 4000 - 4999: config management errors
-#: ../common/rhnException.py:257
+#: ../common/rhnException.py:309
msgid "Configuration action missing"
msgstr ""
-#: ../common/rhnException.py:258
+#: ../common/rhnException.py:310
msgid "File too large"
msgstr ""
-#: ../common/rhnException.py:259
+#: ../common/rhnException.py:311
msgid "File contains binary data"
msgstr ""
-#: ../common/rhnException.py:260
+#: ../common/rhnException.py:312
msgid "Configuration channel is not empty"
msgstr ""
-#: ../common/rhnException.py:261
+#: ../common/rhnException.py:313
msgid "Permission error"
msgstr ""
-#: ../common/rhnException.py:262
+#: ../common/rhnException.py:314
msgid "Content missing for configuration file"
msgstr ""
-#: ../common/rhnException.py:263
+#: ../common/rhnException.py:315
msgid "Template delimiters not specified"
msgstr ""
-#: ../common/rhnException.py:264
+#: ../common/rhnException.py:316
msgid "Configuration channel does not exist"
msgstr ""
-#: ../common/rhnException.py:265
+#: ../common/rhnException.py:317
msgid "Configuration channel already exists"
msgstr ""
-#: ../common/rhnException.py:266
+#: ../common/rhnException.py:318
msgid "File missing from configuration channel"
msgstr ""
-#: ../common/rhnException.py:267
+#: ../common/rhnException.py:319
msgid "Different revision of this file is uploaded"
msgstr ""
-#: ../common/rhnException.py:268
+#: ../common/rhnException.py:320
msgid "File already uploaded to configuration channel"
msgstr ""
-#: ../common/rhnException.py:269
+#: ../common/rhnException.py:321
msgid "File size exceeds remaining quota space"
msgstr ""
-#: ../common/rhnException.py:270
+#: ../common/rhnException.py:322
msgid "Full path of file must be specified"
msgstr ""
-#: ../common/rhnException.py:292
+#. 5000 - 5099: entitlement mapper errors
+#: ../common/rhnException.py:325
+msgid "The speicified item is not present in the input"
+msgstr ""
+
+#: ../common/rhnException.py:326
+msgid "Invalid item code"
+msgstr ""
+
+#: ../common/rhnException.py:327
+msgid "Invalid user role"
+msgstr ""
+
+#: ../common/rhnException.py:328
+msgid "Invalid server group"
+msgstr ""
+
+#: ../common/rhnException.py:329
+msgid "Invalid channel family"
+msgstr ""
+
+#: ../common/rhnException.py:373
msgid ""
"\n"
" An error has occurred while processing your request. If this problem\n"
@@ -1159,24 +1175,24 @@ msgid ""
" details on how to reproduce this problem.\n"
msgstr ""
-#: ../common/rhnException.py:336
+#: ../common/rhnException.py:427
#, python-format
msgid ""
"Error Message:\n"
" %s\n"
msgstr ""
-#: ../common/rhnException.py:338
+#: ../common/rhnException.py:429
#, python-format
msgid "Error Class Code: %s\n"
msgstr ""
-#: ../common/rhnException.py:340
+#: ../common/rhnException.py:431
#, python-format
msgid "Error Class Info: %s\n"
msgstr ""
-#: ../common/rhnException.py:342
+#: ../common/rhnException.py:434
#, python-format
msgid "Explanation: %s"
msgstr ""
diff --git a/backend/po/server.pot b/backend/po/server.pot
index 33f28ff..df3fbda 100644
--- a/backend/po/server.pot
+++ b/backend/po/server.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-02-28 19:31-0500\n"
+"POT-Creation-Date: 2009-12-11 14:15+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
@@ -16,710 +16,632 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../server/apacheAuth.py:44
+#: ../server/handlers/xmlrpc/queue.py:353
#, python-format
-msgid "incomplete proxy authentication token: %s"
+msgid "Invalid action value type %s (%s)"
msgstr ""
-#: ../server/apacheAuth.py:60
+#: ../server/handlers/xmlrpc/queue.py:378
#, python-format
-msgid "Sent proxy signature %s does not match ours %s."
+msgid "Action %s does not belong to server %s"
msgstr ""
-#: ../server/apacheAuth.py:91
-msgid "declined proxy authentication"
+#: ../server/handlers/xmlrpc/proxy.py:55
+#, python-format
+msgid "RHN Proxy service not enabled for server profile: \"%s\""
msgstr ""
-#: ../server/applet/applet.py:56
-msgid "Your system was not found in the RHN database"
+#: ../server/handlers/xmlrpc/proxy.py:74
+msgid "Invalid session key"
msgstr ""
-#: ../server/apacheRequest.py:34
-#, python-format
-msgid "Invalid request received (%s)."
+#: ../server/handlers/xmlrpc/proxy.py:82
+msgid "This server ID no longer exists"
msgstr ""
-#: ../server/apacheRequest.py:92
+#: ../server/handlers/xmlrpc/errata.py:55
#, python-format
-msgid ""
-"IMPORTANT MESSAGE FOLLOWS:\n"
-"%s"
+msgid "Expected a package name, not: %s"
msgstr ""
-#: ../server/apacheRequest.py:117
+#: ../server/handlers/xmlrpc/errata.py:115
#, python-format
-msgid ""
-"While running '%s': caught\n"
-"%s : %s\n"
+msgid "Expected a package, not: %s"
msgstr ""
-#: ../server/apacheRequest.py:499 ../server/redhat_xmlrpc/get_handler.py:32
+#: ../server/handlers/xmlrpc/up2date.py:244
#, python-format
-msgid "Invalid URI %s"
+msgid "Invalid value %s (type %s)"
msgstr ""
-#: ../server/sat/get_handler.py:64
-msgid "Invalid argument"
+#: ../server/handlers/xmlrpc/up2date.py:272
+#, python-format
+msgid "Unable to retrieve package header %s"
msgstr ""
-#: ../server/sat/get_handler.py:89 ../server/sat/kickstart.py:65
+#: ../server/handlers/xmlrpc/up2date.py:438
+#: ../server/handlers/xmlrpc/up2date.py:469
+#: ../server/handlers/xmlrpc/up2date.py:501
#, python-format
-msgid "Kickstart file %s not found in tree %s"
+msgid "Invalid value %s (%s)"
msgstr ""
-#: ../server/sat/get_handler.py:100 ../server/sat/kickstart.py:74
+#: ../server/handlers/xmlrpc/up2date.py:540 ../server/rhnSQL/sql_lib.py:81
#, python-format
-msgid "Kickstart file %s (tree %s) not found on the disk"
+msgid "Invalid value for %s in package tuple: %s (%s)"
msgstr ""
-#: ../server/sat/auth.py:28
+#: ../server/handlers/xmlrpc/up2date.py:552 ../server/rhnSQL/sql_lib.py:93
#, python-format
-msgid "RHN Management Satellite service not enabled for server profile: \"%s\""
+msgid "Invalid package parameter %s (%s)"
msgstr ""
-#: ../server/sat/kickstart.py:44
-#, python-format
-msgid "Kickstart tree %s not accessible"
+#: ../server/handlers/xmlrpc/registration.py:167
+msgid "Required data missing"
msgstr ""
-#: ../server/sat/rhnPackage.py:79 ../server/sat/rhnPackage.py:83
-#: ../server/sat/rhnPackage.py:119 ../server/sat/rhnPackage.py:123
-#: ../server/rhnPackage.py:30 ../server/rhnPackage.py:65
-#: ../server/rhnPackage.py:79 ../server/rhnPackage.py:147
-#: ../server/rhnPackage.py:151 ../server/rhnPackage.py:169
-#: ../server/rhnPackage.py:174 ../server/rhnPackage.py:262
-#: ../server/rhnPackage.py:328 ../server/redhat_xmlrpc/get_handler.py:83
-#, python-format
-msgid "Invalid RPM package %s requested"
+#: ../server/handlers/xmlrpc/registration.py:171
+msgid "Required members missing"
msgstr ""
-#: ../server/sat/rhnPackage.py:87 ../server/sat/rhnPackage.py:127
-#: ../server/rhnPackage.py:84 ../server/rhnPackage.py:157
-#: ../server/rhnPackage.py:180 ../server/rhnPackage.py:268
-#: ../server/rhnPackage.py:334 ../server/redhat_xmlrpc/get_handler.py:105
-msgid "Package not found"
+#: ../server/handlers/xmlrpc/registration.py:180
+msgid "Attempt to register a system to an invalid username"
msgstr ""
-#: ../server/sat/rhnRepository.py:32
-#, python-format
-msgid "Package does not exist or unauthorized to retrieve it %s"
+#: ../server/handlers/xmlrpc/registration.py:847
+msgid "Invalid system release version requested"
msgstr ""
-#: ../server/rhnSQL/sql_lib.py:67 ../server/xmlrpc/up2date.py:523
-#, python-format
-msgid "Invalid value for %s in package tuple: %s (%s)"
+#: ../server/handlers/xmlrpc/registration.py:1035
+msgid "Red Hat Network Welcome Message"
msgstr ""
-#: ../server/rhnSQL/sql_lib.py:79 ../server/xmlrpc/up2date.py:535
+#: ../server/handlers/xmlrpc/registration.py:1045
+msgid "Red Hat Network Privacy Statement"
+msgstr ""
+
+#: ../server/handlers/xmlrpc/registration.py:1064
+msgid "Expected a dictionary as a product argument"
+msgstr ""
+
+#: ../server/handlers/xmlrpc/registration.py:1096
+#: ../server/handlers/xmlrpc/registration.py:1169
#, python-format
-msgid "Invalid package parameter %s (%s)"
+msgid "Not a valid Country: %s"
msgstr ""
-#. nope, not reserved either
-#: ../server/rhnUser.py:490
+#: ../server/handlers/xmlrpc/registration.py:1391
#, python-format
-msgid "Username `%s' has not been reserved"
+msgid "Insufficient subscription permissions for release, arch (%s, %s)"
msgstr ""
-#. New accounts have to specify an e-mail address
-#: ../server/rhnUser.py:496
-msgid "E-mail address not specified"
+#: ../server/handlers/xmlrpc/registration.py:1408
+#, python-format
+msgid "Invalid value '%s' for %s (%s)"
msgstr ""
-#. wrong organization
-#. Invalid org password
-#: ../server/rhnUser.py:551 ../server/rhnUser.py:555
-msgid "Invalid Organization Credentials"
+#: ../server/handlers/sat/auth.py:41
+msgid "ISS is disabled on this satellite."
msgstr ""
-#: ../server/rhnUser.py:561
+#: ../server/handlers/sat/auth.py:53
#, python-format
-msgid "User `%s' not a member of organization %s"
+msgid "Server \"%s\" is not enabled for ISS."
msgstr ""
-#: ../server/rhnUser.py:589
-#, python-format
-msgid "username should be at least %d characters"
+#: ../server/handlers/applet/applet.py:65
+msgid "Your system was not found in the RHN database"
msgstr ""
-#: ../server/rhnUser.py:600
+#: ../server/rhnChannel.py:2119
#, python-format
-msgid "username = `%s', invalid character `%s'"
+msgid ""
+"Your account does not have access to any channels matching (release='%"
+"(release)s', arch='%(arch)s')%(www_activation)s"
msgstr ""
-#: ../server/rhnUser.py:618
+#: ../server/rhnChannel.py:2129
+msgid ""
+"\n"
+"If you have a registration number, please register with it first at http://"
+"www.redhat.com/apps/activate/ and then try again.\n"
+"\n"
+msgstr ""
+
+#: ../server/rhnChannel.py:2139
#, python-format
-msgid "Please limit your e-mail address to %s chars"
+msgid "Insufficient subscription permissions for release (%s, %s"
msgstr ""
-#: ../server/rhnUser.py:635
+#. Various messages that can be reused
+#.
+#. bretm 02/07/2007 -- when we have better old-client documentation, probably
+#. will be safe to get rid of all this crap
+#: ../server/rhnChannel.py:2410 ../server/rhnChannel.py:2421
+#: ../server/rhnChannel.py:2436 ../server/rhnChannel.py:2444
+msgid "System Registered but Inactive"
+msgstr ""
+
+#: ../server/rhnChannel.py:2411
#, python-format
msgid ""
-"A user with the supplied e-mail address (%s)\n"
-" is already registered with Red Hat Network"
+"\n"
+"Invalid Architecture and OS release combination (%s, %s).\n"
+"Your system has been registered, but will not receive updates \n"
+"because it is not subscribed to a channel. If you have not yet\n"
+"activated your product for service, please visit our website at:\n"
+" \n"
+" http://www.redhat.com/apps/activate/\n"
+"\n"
+"...to activate your product."
msgstr ""
-#: ../server/rhnUser.py:704
+#: ../server/rhnChannel.py:2422
#, python-format
-msgid "password must be at least %d characters"
+msgid ""
+"\n"
+"Invalid Architecture and OS release combination (%s, %s).\n"
+"Your system has been registered, but will not receive updates\n"
+"because it could not be subscribed to a base channel.\n"
+"Please contact your organization administrator for assistance.\n"
msgstr ""
-#: ../server/rhnUser.py:721
+#: ../server/rhnChannel.py:2429
#, python-format
-msgid "password contains character `%s'"
+msgid ""
+"\n"
+" This system has been successfully registered, but is not yet entitled\n"
+" to service. To entitle this system to service, login to the web site at:\n"
+"\n"
+" %(entitlement_url)s\n"
msgstr ""
-#: ../server/rhnUser.py:728
+#: ../server/rhnChannel.py:2437
#, python-format
-msgid "username should be at least %d characters long"
+msgid ""
+"\n"
+" This system has been successfully registered, but no service entitlements\n"
+" were available. To entitle this system to service, login to the web site "
+"at:\n"
+"\n"
+" %(entitlement_url)s\n"
msgstr ""
-#: ../server/rhnUser.py:739
-#, python-format
-msgid "Cannot register usernames ending with %s"
+#: ../server/rhnChannel.py:2445
+msgid ""
+"\n"
+" This system has been successfully registered, but the channel "
+"subscriptions\n"
+" were exhausted\n"
msgstr ""
-#: ../server/importlib/userAuth.py:71 ../server/importlib/userAuth.py:75
+#: ../server/importlib/userAuth.py:90 ../server/importlib/userAuth.py:94
msgid "You are not authorized to manage packages in the null org"
msgstr ""
-#: ../server/importlib/userAuth.py:82
+#: ../server/importlib/userAuth.py:101
#, python-format
msgid "You are not allowed to manage packages in the %s org"
msgstr ""
-#: ../server/importlib/userAuth.py:100
+#: ../server/importlib/userAuth.py:119
msgid "You are not allowed to perform administrative tasks"
msgstr ""
-#: ../server/importlib/userAuth.py:127
+#: ../server/importlib/userAuth.py:146
#, python-format
msgid ""
"You are not allowed to manage channel %s, or that channel does not exist"
msgstr ""
-#: ../server/importlib/userAuth.py:181
+#: ../server/importlib/userAuth.py:237
#, python-format
msgid "Channel %s does not exist "
msgstr ""
-#: ../server/rhnServer/server_token.py:67
+#: ../server/apacheAuth.py:55
+#, python-format
+msgid "incomplete proxy authentication token: %s"
+msgstr ""
+
+#: ../server/apacheAuth.py:71
+#, python-format
+msgid "Sent proxy signature %s does not match ours %s."
+msgstr ""
+
+#: ../server/apacheAuth.py:102
+msgid "declined proxy authentication"
+msgstr ""
+
+#. ignore ORA-20277: (product_no_service)
+#: ../server/rhnServer/server_lib.py:66
+msgid "Attempt to register a system failed"
+msgstr ""
+
+#: ../server/rhnServer/server_token.py:85
#, python-format
msgid "Token `%s' has more than one base channel assigned"
msgstr ""
-#: ../server/rhnServer/server_token.py:69
+#: ../server/rhnServer/server_token.py:87
msgid "Conflicting base channels"
msgstr ""
-#: ../server/rhnServer/server_token.py:171
+#: ../server/rhnServer/server_token.py:211
#, python-format
msgid "Failed to add server to group %s"
msgstr ""
-#: ../server/rhnServer/server_token.py:452
+#: ../server/rhnServer/server_token.py:511
#, python-format
msgid "Maximum usage count of %s reached"
msgstr ""
-#: ../server/rhnServer/server_token.py:549
+#: ../server/rhnServer/server_token.py:642
+msgid ""
+"Registration failed: RHN Software Management service entitlements exhausted"
+msgstr ""
+
+#: ../server/rhnServer/server_token.py:759
+msgid ""
+"Stacking of re-registration tokens with different base entitlements is not "
+"supported"
+msgstr ""
+
+#: ../server/rhnServer/server_token.py:837
#, python-format
msgid "Could not find token '%s'"
msgstr ""
#. Cannot use activation keys from different orgs
-#: ../server/rhnServer/server_token.py:569
+#: ../server/rhnServer/server_token.py:869
msgid "Tokens from mismatching orgs"
msgstr ""
#. Two tokens with different kickstart sessions
-#: ../server/rhnServer/server_token.py:579
+#: ../server/rhnServer/server_token.py:879
msgid "Kickstart session mismatch"
msgstr ""
-#: ../server/rhnServer/server_token.py:595
+#: ../server/rhnServer/server_token.py:899
+msgid "Stacking of re-registration tokens is not supported"
+msgstr ""
+
+#: ../server/rhnServer/server_class.py:98
#, python-format
-msgid ""
-"Conflicting entitlement levels for tokens:\n"
-"`%s' (%s) and `%s' (%s)"
+msgid "Architecture `%s' is not supported"
msgstr ""
-#: ../server/rhnServer/server_token.py:612
-msgid "Stacking of re-registration tokens is not supported"
+#: ../server/rhnPackage.py:41 ../server/rhnPackage.py:76
+#: ../server/rhnPackage.py:90 ../server/rhnPackage.py:159
+#: ../server/rhnPackage.py:163 ../server/rhnPackage.py:221
+#: ../server/rhnPackage.py:226 ../server/rhnPackage.py:314
+#: ../server/rhnPackage.py:380
+#, python-format
+msgid "Invalid RPM package %s requested"
msgstr ""
-#: ../server/rhnServer/server_token.py:704
-msgid ""
-"Registration failed: RHN Software Management service entitlements exhausted"
+#: ../server/rhnPackage.py:95 ../server/rhnPackage.py:169
+#: ../server/rhnPackage.py:232 ../server/rhnPackage.py:320
+#: ../server/rhnPackage.py:386
+msgid "Package not found"
msgstr ""
-#: ../server/rhnServer/server_class.py:84
+#: ../server/apacheRequest.py:47
#, python-format
-msgid "Architecture `%s' is not supported"
+msgid "Invalid request received (%s)."
msgstr ""
-#. ignore ORA-20277: (product_no_service)
-#: ../server/rhnServer/server_class.py:457
-msgid "Attempt to register a system failed"
+#: ../server/apacheRequest.py:105
+#, python-format
+msgid ""
+"IMPORTANT MESSAGE FOLLOWS:\n"
+"%s"
msgstr ""
-#: ../server/rhnHandler.py:11
+#: ../server/apacheRequest.py:130
#, python-format
msgid ""
-"\n"
-" Your demo account has been disabled. To enable your account, you must \n"
-" verify your email address by visiting:\n"
-"\n"
-" %(email_link)s\n"
-"\n"
-" You may also enable your account by purchasing Red Hat Network service "
-"at:\n"
-"\n"
-" https://rhn.redhat.com/network/sales/index.pxt\n"
-" \n"
-" Your account name: %(login)s\n"
-" Current email on file: %(email)s\n"
+"While running '%s': caught\n"
+"%s : %s\n"
msgstr ""
-#: ../server/rhnHandler.py:25
+#: ../server/apacheRequest.py:556
#, python-format
-msgid ""
-"\n"
-" Your demo account has been disabled. To enable your account, you must\n"
-" fill out the latest Red Hat Network survey by visiting:\n"
-"\n"
-" %(survey_link)s\n"
-"\n"
-" You may also enable your Red Hat Network account by purchasing service "
-"at:\n"
-"\n"
-" https://rhn.redhat.com/network/sales/index.pxt\n"
-"\n"
-" Your account name: %(login)s\n"
+msgid "Invalid URI %s"
msgstr ""
-#: ../server/rhnHandler.py:75
+#: ../server/rhnHandler.py:58
msgid ""
"Please run rhn_register (or up2date --register on Red Hat Enterprise Linux 3 "
"or later)\n"
"as root on this client"
msgstr ""
-#: ../server/rhnHandler.py:97
+#: ../server/rhnHandler.py:77
#, python-format
msgid "Service not enabled for system profile: \"%s\""
msgstr ""
-#: ../server/xmlrpc/queue.py:342
-#, python-format
-msgid "Invalid action value type %s (%s)"
-msgstr ""
-
-#: ../server/xmlrpc/queue.py:367
-#, python-format
-msgid "Action %s does not belong to server %s"
+#: ../server/rhnUser.py:382 ../server/rhnUser.py:385
+msgid "Invalid username/password combination"
msgstr ""
-#: ../server/xmlrpc/errata.py:44
+#: ../server/rhnUser.py:430
#, python-format
-msgid "Expected a package name, not: %s"
-msgstr ""
-
-#: ../server/xmlrpc/errata.py:103
-#, python-format
-msgid "Expected a package, not: %s"
-msgstr ""
-
-#: ../server/xmlrpc/registration.py:157
-msgid "Required data missing"
-msgstr ""
-
-#: ../server/xmlrpc/registration.py:161
-msgid "Required members missing"
-msgstr ""
-
-#: ../server/xmlrpc/registration.py:182
-msgid "Attempt to register a system to an invalid username"
-msgstr ""
-
-#: ../server/xmlrpc/registration.py:351
-msgid "Invalid system release version requested"
-msgstr ""
-
-#: ../server/xmlrpc/registration.py:484
-msgid "Red Hat Network Welcome Message"
-msgstr ""
-
-#: ../server/xmlrpc/registration.py:494
-msgid "Red Hat Network Privacy Statement"
-msgstr ""
-
-#: ../server/xmlrpc/registration.py:505
-msgid "Expected a dictionary as a product argument"
-msgstr ""
-
-#: ../server/xmlrpc/registration.py:537 ../server/xmlrpc/registration.py:590
-#, python-format
-msgid "Not a valid Country: %s"
-msgstr ""
-
-#: ../server/xmlrpc/registration.py:622
msgid ""
"\n"
-" The product registration code can be found on the\n"
-" registration card included with the product"
+" %s Account has been deactivated on this server.\n"
+" Please contact your Org administrator for more help."
msgstr ""
-#. already registered
-#: ../server/xmlrpc/registration.py:627
-msgid ""
-"\n"
-" The code that you have entered has been already\n"
-" registered. Please contact Red Hat Customer Support\n"
-" at http://www.redhat.com/services/tools/installation/\n"
-" "
-msgstr ""
-
-#: ../server/xmlrpc/registration.py:633
+#. nope, not reserved either
+#: ../server/rhnUser.py:548
#, python-format
-msgid ""
-"\n"
-" Invalid product registration number.\n"
-" The product registration code can be found on the\n"
-" registration card included with the product. Please\n"
-" check carefully that you have entered the correct\n"
-" registration number. Invalid: %s"
+msgid "Username `%s' has not been reserved"
msgstr ""
-#: ../server/xmlrpc/registration.py:773
-#, python-format
-msgid "Insufficient subscription permissions for release, arch (%s, %s)"
+#. New accounts have to specify an e-mail address
+#: ../server/rhnUser.py:554
+msgid "E-mail address not specified"
msgstr ""
-#: ../server/xmlrpc/registration.py:788
-#, python-format
-msgid "Invalid value '%s' for %s (%s)"
+#. wrong organization
+#. Invalid org password
+#: ../server/rhnUser.py:609 ../server/rhnUser.py:613
+msgid "Invalid Organization Credentials"
msgstr ""
-#: ../server/xmlrpc/up2date.py:232
+#: ../server/rhnUser.py:619
#, python-format
-msgid "Invalid value %s (type %s)"
+msgid "User `%s' not a member of organization %s"
msgstr ""
-#: ../server/xmlrpc/up2date.py:260
+#: ../server/rhnUser.py:647
#, python-format
-msgid "Unable to retrieve package header %s"
+msgid "username should be at least %d characters"
msgstr ""
-#: ../server/xmlrpc/up2date.py:424 ../server/xmlrpc/up2date.py:454
-#: ../server/xmlrpc/up2date.py:485
+#: ../server/rhnUser.py:650
#, python-format
-msgid "Invalid value %s (%s)"
+msgid "username should be less than %d characters"
msgstr ""
-#: ../server/xmlrpc/proxy.py:46
+#: ../server/rhnUser.py:661
#, python-format
-msgid "RHN Proxy service not enabled for server profile: \"%s\""
-msgstr ""
-
-#: ../server/xmlrpc/proxy.py:65
-msgid "Invalid session key"
-msgstr ""
-
-#: ../server/xmlrpc/proxy.py:73
-msgid "This server ID no longer exists"
+msgid "username = `%s', invalid character `%s'"
msgstr ""
-#: ../server/rhnChannel.py:1565
+#: ../server/rhnUser.py:679
#, python-format
-msgid ""
-"Your account does not have access to any channels matching (release='%"
-"(release)s', arch='%(arch)s')%(www_activation)s"
-msgstr ""
-
-#: ../server/rhnChannel.py:1575
-msgid ""
-"\n"
-"If you have a registration number, please register with it first at http://"
-"www.redhat.com/apps/activate/ and then try again.\n"
-"\n"
+msgid "Please limit your e-mail address to %s chars"
msgstr ""
-#: ../server/rhnChannel.py:1585
+#: ../server/rhnUser.py:698
#, python-format
-msgid "Insufficient subscription permissions for release (%s, %s"
-msgstr ""
-
-#. Various messages that can be reused
-#: ../server/rhnChannel.py:1837 ../server/rhnChannel.py:1847
-#: ../server/rhnChannel.py:1854 ../server/rhnChannel.py:1865
-#: ../server/rhnChannel.py:1880 ../server/rhnChannel.py:1888
-msgid "System Registered but Inactive"
-msgstr ""
-
-#: ../server/rhnChannel.py:1838
msgid ""
-"\n"
-" Your system has been registered, but will not receive updates until \n"
-" your product has been activated. Visit our website at:\n"
-" \n"
-" http://www.redhat.com/now\n"
-"\n"
-" ...to activate your product.\n"
-msgstr ""
-
-#: ../server/rhnChannel.py:1848
-msgid ""
-"\n"
-" Your system has been registered, but will not receive updates because\n"
-" it could not be subscribed to a base channel. Please contact your\n"
-" organization administrator for assistance.\n"
+"A user with the supplied e-mail address (%s)\n"
+" is already registered with Red Hat Network"
msgstr ""
-#: ../server/rhnChannel.py:1855
+#: ../server/rhnUser.py:767
#, python-format
-msgid ""
-"\n"
-"Invalid Architecture and OS release combination (%s, %s).\n"
-"Your system has been registered, but will not receive updates \n"
-"because it is not subscribed to a channel. If you have not yet\n"
-"activated your product for service, please visit our website at:\n"
-" \n"
-" http://www.redhat.com/now\n"
-"\n"
-"...to activate your product."
+msgid "password must be at least %d characters"
msgstr ""
-#: ../server/rhnChannel.py:1866
+#: ../server/rhnUser.py:770
#, python-format
-msgid ""
-"\n"
-"Invalid Architecture and OS release combination (%s, %s).\n"
-"Your system has been registered, but will not receive updates\n"
-"because it could not be subscribed to a base channel.\n"
-"Please contact your organization administrator for assistance.\n"
+msgid "Password must be shorter than %d characters"
msgstr ""
-#: ../server/rhnChannel.py:1873
+#: ../server/rhnUser.py:788
#, python-format
-msgid ""
-"\n"
-" This system has been successfully registered, but is not yet entitled\n"
-" to service. To entitle this system to service, login to the web site at:\n"
-"\n"
-" %(entitlement_url)s\n"
+msgid "password contains character `%s'"
msgstr ""
-#: ../server/rhnChannel.py:1881
+#: ../server/rhnUser.py:795
#, python-format
-msgid ""
-"\n"
-" This system has been successfully registered, but no service entitlements\n"
-" were available. To entitle this system to service, login to the web site "
-"at:\n"
-"\n"
-" %(entitlement_url)s\n"
+msgid "username should be at least %d characters long"
msgstr ""
-#: ../server/rhnChannel.py:1889
-msgid ""
-"\n"
-" This system has been successfully registered, but the channel "
-"subscriptions\n"
-" were exhausted\n"
+#: ../server/rhnUser.py:806
+#, python-format
+msgid "Cannot register usernames ending with %s"
msgstr ""
-#: ../common/rhnException.py:28
+#: ../common/rhnException.py:43
msgid "Outage mode"
msgstr ""
#. 0-999: RHN client/client-like interaction errors:
-#: ../common/rhnException.py:30
+#: ../common/rhnException.py:45
msgid "This does not appear to be a valid username."
msgstr ""
-#: ../common/rhnException.py:31
+#: ../common/rhnException.py:46
msgid "Invalid username and password combination."
msgstr ""
-#: ../common/rhnException.py:32
-msgid "This username is already taken, or the password is incorrect."
+#: ../common/rhnException.py:47
+msgid "This login is already taken, or the password is incorrect."
msgstr ""
-#: ../common/rhnException.py:33
+#: ../common/rhnException.py:48
msgid "Permission denied."
msgstr ""
-#: ../common/rhnException.py:34
+#: ../common/rhnException.py:49
msgid "Can not create new entry."
msgstr ""
-#: ../common/rhnException.py:35
+#: ../common/rhnException.py:50
msgid "Object not found."
msgstr ""
-#: ../common/rhnException.py:36
+#: ../common/rhnException.py:51
msgid "Account limits exceeded."
msgstr ""
-#: ../common/rhnException.py:37
+#: ../common/rhnException.py:52
msgid "Invalid System Digital ID."
msgstr ""
-#: ../common/rhnException.py:38
+#: ../common/rhnException.py:53
msgid "Invalid System Credentials."
msgstr ""
-#: ../common/rhnException.py:39
+#: ../common/rhnException.py:54
msgid "Could not retrieve user data from database."
msgstr ""
-#: ../common/rhnException.py:40
+#: ../common/rhnException.py:55
msgid "Valid username required."
msgstr ""
-#: ../common/rhnException.py:41
+#: ../common/rhnException.py:56
msgid "Valid password required."
msgstr ""
-#: ../common/rhnException.py:42
+#: ../common/rhnException.py:57
msgid "Minimum username length violation."
msgstr ""
-#: ../common/rhnException.py:43
+#: ../common/rhnException.py:58
msgid "Minimum password length violation."
msgstr ""
-#: ../common/rhnException.py:44
+#: ../common/rhnException.py:59
msgid "The username contains invalid characters."
msgstr ""
-#: ../common/rhnException.py:45
+#: ../common/rhnException.py:60
msgid "Invalid product registration code."
msgstr ""
-#: ../common/rhnException.py:46
+#: ../common/rhnException.py:61
msgid "File not found."
msgstr ""
-#: ../common/rhnException.py:47
+#: ../common/rhnException.py:62
msgid "Invalid Architecture and OS release combination."
msgstr ""
-#: ../common/rhnException.py:48
+#: ../common/rhnException.py:63
msgid "Architecture and OS version combination is not supported."
msgstr ""
-#: ../common/rhnException.py:49
+#: ../common/rhnException.py:64
msgid "Could not retrieve system data from database."
msgstr ""
-#: ../common/rhnException.py:50
+#: ../common/rhnException.py:65
msgid "Invalid arguments passed to function."
msgstr ""
-#: ../common/rhnException.py:51
+#: ../common/rhnException.py:66
msgid "Unable to retrieve requested entry."
msgstr ""
-#: ../common/rhnException.py:52
+#: ../common/rhnException.py:67
msgid "Could not update database entry."
msgstr ""
-#: ../common/rhnException.py:53
+#: ../common/rhnException.py:68
msgid "Unsupported server architecture."
msgstr ""
-#: ../common/rhnException.py:54
+#: ../common/rhnException.py:69
msgid "LDAP operation failed."
msgstr ""
-#: ../common/rhnException.py:55
+#: ../common/rhnException.py:70
msgid "Backend RPM database failure: can not retrieve requested information."
msgstr ""
-#: ../common/rhnException.py:56
+#: ../common/rhnException.py:72
msgid "Server Entry is busy."
msgstr ""
-#: ../common/rhnException.py:57
+#: ../common/rhnException.py:73
#, python-format
msgid ""
"\n"
" The anonymous server functionality is no longer available.\n"
"\n"
-" Please re-register this system by running rhn_register \n"
+" Please re-register this system by running rhn_register\n"
" (or up2date --register on Red Hat Enterprise Linux 3+) as root.\n"
" Please visit https://%(hostname)s/rhn/systems/SystemEntitlements.do\n"
-" or login at https://%(hostname)s, and from the \"Systems\" tab,\n"
-" select \"System Entitlements\" to enable RHN service for this system.\n"
+" or login at https://%(hostname)s, and from the \"Overview\" tab,\n"
+" select \"Subscription Management\" to enable RHN service for this "
+"system.\n"
" "
msgstr ""
-#: ../common/rhnException.py:66
+#: ../common/rhnException.py:82
msgid "Record not available in the database."
msgstr ""
-#: ../common/rhnException.py:67
+#: ../common/rhnException.py:83
msgid "Invalid value for entry."
msgstr ""
-#: ../common/rhnException.py:68
+#: ../common/rhnException.py:84
#, python-format
msgid ""
"\n"
" This system does not have a valid entitlement for Red Hat Network.\n"
" Please visit https://%(hostname)s/rhn/systems/SystemEntitlements.do\n"
-" or login at https://%(hostname)s, and from the \"Systems\" tab,\n"
-" select \"System Entitlements\" to enable RHN service for this system.\n"
+" or login at https://%(hostname)s, and from the \"Overview\" tab,\n"
+" select \"Subscription Management\" to enable RHN service for this "
+"system.\n"
" "
msgstr ""
-#: ../common/rhnException.py:74
+#: ../common/rhnException.py:90
msgid "Channel error"
msgstr ""
-#: ../common/rhnException.py:75
+#: ../common/rhnException.py:91
msgid "Client session token is invalid."
msgstr ""
-#: ../common/rhnException.py:76
+#: ../common/rhnException.py:92
msgid "Client session token has expired."
msgstr ""
-#: ../common/rhnException.py:77
+#: ../common/rhnException.py:93
msgid "You are not authorized to retrieve the requested object."
msgstr ""
-#: ../common/rhnException.py:78
+#: ../common/rhnException.py:94
msgid "Invalid action"
msgstr ""
-#: ../common/rhnException.py:79
+#: ../common/rhnException.py:95
msgid "You are not allowed to perform administrative tasks on this system."
msgstr ""
-#: ../common/rhnException.py:80
+#: ../common/rhnException.py:97
msgid "The system is already subscribed to the specified channel."
msgstr ""
-#: ../common/rhnException.py:81
+#: ../common/rhnException.py:98
msgid "The system is not currently subscribed to the specified channel."
msgstr ""
-#: ../common/rhnException.py:82
+#: ../common/rhnException.py:99
msgid "The specified channel does not exist."
msgstr ""
-#: ../common/rhnException.py:83
+#: ../common/rhnException.py:100
msgid "Invalid channel version."
msgstr ""
-#: ../common/rhnException.py:84
+#: ../common/rhnException.py:101
msgid "Invalid ORG_ID requested"
msgstr ""
-#: ../common/rhnException.py:85
+#: ../common/rhnException.py:102
msgid ""
"\n"
" User group membership limits exceeded.\n"
@@ -733,7 +655,7 @@ msgid ""
" "
msgstr ""
-#: ../common/rhnException.py:93
+#: ../common/rhnException.py:110
msgid ""
"\n"
" System group membership limits exceeded.\n"
@@ -747,7 +669,7 @@ msgid ""
" "
msgstr ""
-#: ../common/rhnException.py:101
+#: ../common/rhnException.py:118
msgid ""
"\n"
" Invalid architecture.\n"
@@ -756,7 +678,7 @@ msgid ""
" "
msgstr ""
-#: ../common/rhnException.py:106
+#: ../common/rhnException.py:123
msgid ""
"\n"
" Incompatible architectures.\n"
@@ -766,11 +688,11 @@ msgid ""
" "
msgstr ""
-#: ../common/rhnException.py:112
+#: ../common/rhnException.py:129
msgid "Invalid RPM header"
msgstr ""
-#: ../common/rhnException.py:113
+#: ../common/rhnException.py:130
msgid ""
"\n"
" Invalid channel.\n"
@@ -779,7 +701,7 @@ msgid ""
" "
msgstr ""
-#: ../common/rhnException.py:118
+#: ../common/rhnException.py:135
#, python-format
msgid ""
"\n"
@@ -800,22 +722,22 @@ msgid ""
msgstr ""
#. For the uploading tools
-#: ../common/rhnException.py:134
+#: ../common/rhnException.py:151
msgid "Invalid information uploaded to the server"
msgstr ""
-#: ../common/rhnException.py:135
+#: ../common/rhnException.py:152
#, python-format
msgid ""
"\n"
" Demo service currently disabled due to high load. If you would like\n"
-" to see Red Hat's policies on Demo service, or find out how you can \n"
-" purchase a subscription service and receive priority download access, \n"
+" to see Red Hat's policies on Demo service, or find out how you can\n"
+" purchase a subscription service and receive priority download access,\n"
" please go to http://%(hostname)s/preview/index.pxt\n"
" "
msgstr ""
-#: ../common/rhnException.py:141
+#: ../common/rhnException.py:158
#, python-format
msgid ""
"\n"
@@ -827,29 +749,50 @@ msgid ""
" "
msgstr ""
-#: ../common/rhnException.py:147
+#: ../common/rhnException.py:164
msgid "Error uploading network interfaces configuration."
msgstr ""
+#: ../common/rhnException.py:165
+msgid ""
+"\n"
+" Package Upload Failed due to uniqueness constraint violation.\n"
+" Make sure the package does not have any duplicate dependencies or\n"
+" does not already exists on the server\n"
+" "
+msgstr ""
+
+#: ../common/rhnException.py:170
+msgid ""
+"\n"
+" The --force rhnpush option is disabled on this server. \n"
+" Please contact your Satellite administrator for more help.\n"
+" "
+msgstr ""
+
#. 60-70: token errors
-#: ../common/rhnException.py:150
-msgid "Invalid system registration token"
+#: ../common/rhnException.py:176
+msgid ""
+"\n"
+" The activation token specified could not be found on the server.\n"
+" Please retry with a valid key.\n"
+" "
msgstr ""
-#: ../common/rhnException.py:151
+#: ../common/rhnException.py:180
msgid "Too many systems registered using this registration token"
msgstr ""
-#: ../common/rhnException.py:152
+#: ../common/rhnException.py:181
msgid "Token contains invalid, obsoleted or insufficient settings"
msgstr ""
-#: ../common/rhnException.py:153
+#: ../common/rhnException.py:182
msgid "Conflicting activation tokens"
msgstr ""
#. 70-80: channel subscription errors
-#: ../common/rhnException.py:156
+#: ../common/rhnException.py:185
msgid ""
"\n"
" All available subscriptions for the requested channel have been "
@@ -858,143 +801,170 @@ msgid ""
" "
msgstr ""
-#: ../common/rhnException.py:160
+#: ../common/rhnException.py:189
msgid ""
"\n"
" You do not have subscription permission to the designated channel.\n"
-" Please refer to your organization's channel or organization "
-"administrators for\n"
-" further details.\n"
+" Please refer to your organization's channel or organization\n"
+" administrators for further details.\n"
" "
msgstr ""
+#: ../common/rhnException.py:194
+msgid "You can not unsubscribe from base channel."
+msgstr ""
+
#. 80-90: server group errors
-#: ../common/rhnException.py:167
+#: ../common/rhnException.py:197
msgid "There was an error while trying to join the system to its groups"
msgstr ""
#. 90-100: entitlement errors
-#: ../common/rhnException.py:170
+#: ../common/rhnException.py:200
msgid "Unable to entitle system"
msgstr ""
-#: ../common/rhnException.py:171
+#: ../common/rhnException.py:201
msgid ""
"Registration token unable to entitle system: maximum membership exceeded"
msgstr ""
#. 100-109: e-mail and uuid related faults
-#: ../common/rhnException.py:174
+#: ../common/rhnException.py:205
msgid "Maximum e-mail length violation."
msgstr ""
-#: ../common/rhnException.py:175
+#: ../common/rhnException.py:206
msgid "Changing e-mail address is not supported."
msgstr ""
-#: ../common/rhnException.py:176
+#: ../common/rhnException.py:207
msgid "Unique e-mail address check failed."
msgstr ""
-#: ../common/rhnException.py:177
+#: ../common/rhnException.py:208
msgid "This system has been previously registered."
msgstr ""
-#: ../common/rhnException.py:178
+#: ../common/rhnException.py:209
msgid "Invalid username"
msgstr ""
#. 110-129: disabled org errors
-#: ../common/rhnException.py:181
+#: ../common/rhnException.py:212
msgid "Service for your account has been disabled."
msgstr ""
-#: ../common/rhnException.py:182
+#: ../common/rhnException.py:213
msgid "Email address not validated; service disabled"
msgstr ""
-#: ../common/rhnException.py:183
+#: ../common/rhnException.py:214
msgid "Survey not filled out; service disabled"
msgstr ""
#. 130-140: bugzilla errata import errors
-#: ../common/rhnException.py:186
+#: ../common/rhnException.py:217
msgid "Bugzilla erratum import error"
msgstr ""
#. 140-159 applet errors
-#: ../common/rhnException.py:189
+#: ../common/rhnException.py:220
msgid "Unable to look up server"
msgstr ""
#. 160-179: OSAD errors
-#: ../common/rhnException.py:192
+#: ../common/rhnException.py:223
msgid "Required argument is missing"
msgstr ""
#. 500-599: Package Uploader errors
-#: ../common/rhnException.py:195
+#: ../common/rhnException.py:226
msgid "Missing HTTP header information"
msgstr ""
-#: ../common/rhnException.py:196
+#: ../common/rhnException.py:227
msgid "The package's checksum signature does not match the header one"
msgstr ""
-#: ../common/rhnException.py:197
+#: ../common/rhnException.py:228
msgid "Header information does not match package metainformation"
msgstr ""
-#: ../common/rhnException.py:198
+#: ../common/rhnException.py:229
msgid "Package with a different signature already uploaded"
msgstr ""
-#: ../common/rhnException.py:199
+#: ../common/rhnException.py:230
msgid "Not an RPM package"
msgstr ""
-#: ../common/rhnException.py:200
+#: ../common/rhnException.py:231
msgid "Unsigned RPM package"
msgstr ""
-#: ../common/rhnException.py:201
+#: ../common/rhnException.py:232
msgid "Incompatible package and channel architectures"
msgstr ""
+#: ../common/rhnException.py:233
+msgid "Incompatible checksum type"
+msgstr ""
+
+#. 600-699: RHEL5+ EN errors
+#: ../common/rhnException.py:236
+msgid "Invalid Entitlement Number"
+msgstr ""
+
+#: ../common/rhnException.py:237
+msgid "No entitlement information tied to hardware"
+msgstr ""
+
+#: ../common/rhnException.py:238
+msgid "Installation number is not entitling"
+msgstr ""
+
+#. 700-799: Additional user input verification errors.
+#: ../common/rhnException.py:241
+msgid "Maximum username length violation"
+msgstr ""
+
+#: ../common/rhnException.py:242
+msgid "Maximum password length violation"
+msgstr ""
+
#. 1000-1999: RHN Proxy specific errors:
#. issued by an RHN Proxy to the client
-#: ../common/rhnException.py:205
+#: ../common/rhnException.py:246
msgid "RHN Proxy error."
msgstr ""
-#: ../common/rhnException.py:206
+#: ../common/rhnException.py:247
msgid "RHN Proxy unable to login."
msgstr ""
#. issued by an RHN Server/Satellite to the proxy
-#: ../common/rhnException.py:208
+#: ../common/rhnException.py:249
msgid ""
"\n"
" RHN Proxy system ID does not match an RHN Proxy Server\n"
" in the database. Please contact your designated Red Hat representative\n"
-" or visit https://rhn.redhat.com/help/contact.pxt immediately if "
-"experiencing\n"
-" difficulties with the process of enabling or continued enablement of "
-"this\n"
-" RHN Proxy Server.\n"
+" or visit https://rhn.redhat.com/help/contact.pxt immediately if\n"
+" experiencing difficulties with the process of enabling or continued\n"
+" enablement of this RHN Proxy Server.\n"
" "
msgstr ""
-#: ../common/rhnException.py:215
+#: ../common/rhnException.py:256
msgid "RHN Proxy session token is invalid."
msgstr ""
-#: ../common/rhnException.py:216
+#: ../common/rhnException.py:257
msgid "RHN Proxy session token has expired."
msgstr ""
#. 2000-2999: RHN Satellite specific errors:
-#: ../common/rhnException.py:220
+#: ../common/rhnException.py:261
msgid ""
"\n"
" RHN Satellite user creation is not allowed via rhn_register\n"
@@ -1003,150 +973,196 @@ msgid ""
" "
msgstr ""
-#: ../common/rhnException.py:225
+#: ../common/rhnException.py:266
msgid ""
"\n"
" RHN Satellite system ID does not match an RHN Satellite Server\n"
" in the database. Please contact your designated Red Hat representative\n"
-" or visit https://rhn.redhat.com/help/contact.pxt immediately if "
-"experiencing\n"
-" difficulties with the process of enabling or continued enablement of "
-"this\n"
-" RHN Satellite Server.\n"
+" or visit https://rhn.redhat.com/help/contact.pxt immediately if\n"
+" experiencing difficulties with the process of enabling or continued\n"
+" enablement of this RHN Satellite Server.\n"
" "
msgstr ""
-#: ../common/rhnException.py:232
+#: ../common/rhnException.py:273
msgid ""
"\n"
" This satellite server is not allowed to access the specified channel\n"
" "
msgstr ""
+#: ../common/rhnException.py:276
+msgid ""
+"\n"
+" This satellite server is not allowed to use Inter Satellite Sync on "
+"this satellite\n"
+" "
+msgstr ""
+
+#: ../common/rhnException.py:279
+msgid ""
+"\n"
+" Inter Satellite Sync is disabled on this satellite.\n"
+" "
+msgstr ""
+
#. Kickstart errors
-#: ../common/rhnException.py:237
+#: ../common/rhnException.py:284
msgid "Access denied to kickstart tree"
msgstr ""
-#: ../common/rhnException.py:238
+#: ../common/rhnException.py:285
msgid "Could not find kickstart file"
msgstr ""
+#: ../common/rhnException.py:286
+msgid ""
+"\n"
+" Kickstart tree would not lint, there are packages\n"
+" missing in the channel\n"
+" "
+msgstr ""
+
#. 3000-3999: XML dumper errors:
-#: ../common/rhnException.py:241
+#: ../common/rhnException.py:292
msgid "Invalid datatype passed"
msgstr ""
-#: ../common/rhnException.py:242
+#: ../common/rhnException.py:293
msgid "Unable to retrieve channel"
msgstr ""
-#: ../common/rhnException.py:243
+#: ../common/rhnException.py:294
msgid "Invalid package name"
msgstr ""
-#: ../common/rhnException.py:244
+#: ../common/rhnException.py:295
msgid "Unable to retrieve package"
msgstr ""
-#: ../common/rhnException.py:245
+#: ../common/rhnException.py:296
msgid "Invalid erratum name"
msgstr ""
-#: ../common/rhnException.py:246
+#: ../common/rhnException.py:297
msgid "Unable to retrieve erratum"
msgstr ""
-#: ../common/rhnException.py:247
+#: ../common/rhnException.py:298
msgid "Invalid satellite certificate"
msgstr ""
-#: ../common/rhnException.py:248
+#: ../common/rhnException.py:299
msgid "File is missing"
msgstr ""
-#: ../common/rhnException.py:249
+#: ../common/rhnException.py:300
msgid "Function retrieval error"
msgstr ""
-#: ../common/rhnException.py:250
+#: ../common/rhnException.py:301
msgid "Function execution error"
msgstr ""
-#: ../common/rhnException.py:251
+#: ../common/rhnException.py:302
msgid "Missing version string"
msgstr ""
-#: ../common/rhnException.py:252
+#: ../common/rhnException.py:303
msgid "Invalid version string"
msgstr ""
-#: ../common/rhnException.py:253
+#: ../common/rhnException.py:304
msgid "Mismatching versions"
msgstr ""
-#: ../common/rhnException.py:254
+#: ../common/rhnException.py:305
msgid "Invalid channel version"
msgstr ""
+#: ../common/rhnException.py:306
+msgid "Missing snapshot for channels"
+msgstr ""
+
#. 4000 - 4999: config management errors
-#: ../common/rhnException.py:257
+#: ../common/rhnException.py:309
msgid "Configuration action missing"
msgstr ""
-#: ../common/rhnException.py:258
+#: ../common/rhnException.py:310
msgid "File too large"
msgstr ""
-#: ../common/rhnException.py:259
+#: ../common/rhnException.py:311
msgid "File contains binary data"
msgstr ""
-#: ../common/rhnException.py:260
+#: ../common/rhnException.py:312
msgid "Configuration channel is not empty"
msgstr ""
-#: ../common/rhnException.py:261
+#: ../common/rhnException.py:313
msgid "Permission error"
msgstr ""
-#: ../common/rhnException.py:262
+#: ../common/rhnException.py:314
msgid "Content missing for configuration file"
msgstr ""
-#: ../common/rhnException.py:263
+#: ../common/rhnException.py:315
msgid "Template delimiters not specified"
msgstr ""
-#: ../common/rhnException.py:264
+#: ../common/rhnException.py:316
msgid "Configuration channel does not exist"
msgstr ""
-#: ../common/rhnException.py:265
+#: ../common/rhnException.py:317
msgid "Configuration channel already exists"
msgstr ""
-#: ../common/rhnException.py:266
+#: ../common/rhnException.py:318
msgid "File missing from configuration channel"
msgstr ""
-#: ../common/rhnException.py:267
+#: ../common/rhnException.py:319
msgid "Different revision of this file is uploaded"
msgstr ""
-#: ../common/rhnException.py:268
+#: ../common/rhnException.py:320
msgid "File already uploaded to configuration channel"
msgstr ""
-#: ../common/rhnException.py:269
+#: ../common/rhnException.py:321
msgid "File size exceeds remaining quota space"
msgstr ""
-#: ../common/rhnException.py:270
+#: ../common/rhnException.py:322
msgid "Full path of file must be specified"
msgstr ""
-#: ../common/rhnException.py:292
+#. 5000 - 5099: entitlement mapper errors
+#: ../common/rhnException.py:325
+msgid "The speicified item is not present in the input"
+msgstr ""
+
+#: ../common/rhnException.py:326
+msgid "Invalid item code"
+msgstr ""
+
+#: ../common/rhnException.py:327
+msgid "Invalid user role"
+msgstr ""
+
+#: ../common/rhnException.py:328
+msgid "Invalid server group"
+msgstr ""
+
+#: ../common/rhnException.py:329
+msgid "Invalid channel family"
+msgstr ""
+
+#: ../common/rhnException.py:373
msgid ""
"\n"
" An error has occurred while processing your request. If this problem\n"
@@ -1156,24 +1172,24 @@ msgid ""
" details on how to reproduce this problem.\n"
msgstr ""
-#: ../common/rhnException.py:336
+#: ../common/rhnException.py:427
#, python-format
msgid ""
"Error Message:\n"
" %s\n"
msgstr ""
-#: ../common/rhnException.py:338
+#: ../common/rhnException.py:429
#, python-format
msgid "Error Class Code: %s\n"
msgstr ""
-#: ../common/rhnException.py:340
+#: ../common/rhnException.py:431
#, python-format
msgid "Error Class Info: %s\n"
msgstr ""
-#: ../common/rhnException.py:342
+#: ../common/rhnException.py:434
#, python-format
msgid "Explanation: %s"
msgstr ""
commit be0fcce9582f425247883259b6a38990dd62a913
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Dec 11 14:16:55 2009 +0100
Specify source as utf-8, otherwise
make update-po
was failing with
xgettext: Non-ASCII string at ../server/repomd/repository.py:419.
Please specify the source encoding through --from-code.
make: *** [server.pot] Error 1
diff --git a/backend/po/Makefile b/backend/po/Makefile
index 27479a4..a4317d7 100644
--- a/backend/po/Makefile
+++ b/backend/po/Makefile
@@ -15,7 +15,7 @@ POTFILE = $(NLSPACKAGE).pot
MSGMERGE = msgmerge -v
PYGETTEXT = ./pygettext.py --default-domain=$(NLSPACKAGE) \
--verbose --output-file=$(NLSPACKAGE).po
-XGETTEXT = xgettext --default-domain=$(NLSPACKAGE) \
+XGETTEXT = xgettext --default-domain=$(NLSPACKAGE) --from-code utf-8 \
--add-comments
MSGFMT = msgfmt --statistics --verbose
commit 60717201deac28c6f3d77551f29615dc9788d796
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Dec 11 13:58:35 2009 +0100
Remove this spelling of Morocco.
diff --git a/backend/server/handlers/xmlrpc/country.py b/backend/server/handlers/xmlrpc/country.py
index b3c150f..71337a8 100644
--- a/backend/server/handlers/xmlrpc/country.py
+++ b/backend/server/handlers/xmlrpc/country.py
@@ -137,7 +137,6 @@ country_to_iso = {
'Lithuania':'LT',
'Lithuania':'LX',
'Luxembourg':'LU',
- 'M\350\267\251co':'MA',
'Macau':'MO',
'Macedonia':'MK',
'Madagascar':'MG',
14 years, 5 months
2 commits - backend/server schema/util
by Jan Pazdziora
backend/server/rhnHandler.py | 27 ---
schema/util/scripts/push-product.py | 260 ------------------------------------
2 files changed, 287 deletions(-)
New commits:
commit 7c854ea28f3098e0954ee8cc46e396935811a700
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Dec 11 13:48:17 2009 +0100
The disabled_error_msg and disabled_freeloader_msg strings do not seem to be used anywhere, removing as dead code.
diff --git a/backend/server/rhnHandler.py b/backend/server/rhnHandler.py
index 25e2932..25fe306 100644
--- a/backend/server/rhnHandler.py
+++ b/backend/server/rhnHandler.py
@@ -19,33 +19,6 @@ from common.rhnTranslate import _
from server import rhnServer
-disabled_error_msg = _("""
- Your demo account has been disabled. To enable your account, you must
- verify your email address by visiting:
-
- %(email_link)s
-
- You may also enable your account by purchasing Red Hat Network service at:
-
- https://rhn.redhat.com/network/sales/index.pxt
-
- Your account name: %(login)s
- Current email on file: %(email)s
-""")
-
-disabled_freeloader_msg = _("""
- Your demo account has been disabled. To enable your account, you must
- fill out the latest Red Hat Network survey by visiting:
-
- %(survey_link)s
-
- You may also enable your Red Hat Network account by purchasing service at:
-
- https://rhn.redhat.com/network/sales/index.pxt
-
- Your account name: %(login)s
-""")
-
# extend the RPC_Base base class
class rhnHandler(RPC_Base):
def __init__(self):
commit 1721ca2b8c1afd257c39aaa222ffe97466041671
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Dec 11 13:41:46 2009 +0100
The push-product.py script was using rhnService* tables that do not exists in Spacewalk 0.7, removing as dead code.
diff --git a/schema/util/scripts/push-product.py b/schema/util/scripts/push-product.py
deleted file mode 100644
index d1b8f3e..0000000
--- a/schema/util/scripts/push-product.py
+++ /dev/null
@@ -1,260 +0,0 @@
-#!/usr/bin/python
-
-import exceptions
-
-error_on_dupes = 1
-config_file = "products.csv"
-action = None
-
-class DuplicateItemError(exceptions.Exception):
- def __init__(self, type, label, quantity)
- self.args = args
-
-# this one's completely abstract.
-class MapTable:
- def delete(self, **kw):
- h = db.parse(self.deleteQuery)
- args = {}
- for key in self.deleteArgs:
- args[key] = kw[key]
- apply(h.execute,args,None)
-
- def insert(self, **kw):
- h = db.parse(self.insertQuery)
- args = {}
- for key in self.insertArgs:
- args[key] = kw[key]
- apply(h.execute,args,None)
-
- def has_key(self, **kw):
- h = db.parse(self.hkQuery)
- args = {}
- for key in self.hkArgs:
- args[key] = kw[key]
- apply(h.execute,args,None)
-
-class ChannelFamilyMap(MapTable):
- def __init__(self):
- self.deleteQuery = """\
- delete from rhnServiceChannelFamilyMap
- where product_id = (
- select product_id
- from rh_product
- where item_code = :product
- )
- and family_id = (
- select product_id
- from rhnChannelFamily
- where label = :label
- )
- """
- self.deleteArgs = ['product','label']
-
- self.insertArgs = """\
- insert into rhnServiceChannelFamilyMap (
- product_id, family_id, quantity
- ) (
- select rp.product_id,
- cf.id,
- :quantity
- from rhnChannelFamily cf,
- rh_product rp
- where rp.item_code = :product
- and cf.label = :label
- )
- """
- self.insertArgs = ['product','label','quantity']
-
- self.hkQuery = """\
- select 1
- from rhnServiceChannelFamilyMap
- where product_id = (
- select product_id
- from rh_product
- where item_code = :product
- )
- and family_id = (
- select product_id
- from rhnChannelFamily
- where label = :label
- )
- """
- self.hkArgs = ['product','label']
-
-class ServerGroupMap(MapTable):
- def __init__(self):
- self.deleteQuery = """\
- delete from rhnServiceServerGroupMap
- where product_id = (
- select product_id
- from rh_product
- where item_code = :product
- )
- and group_type = (
- select id
- from rhnServerGroupType
- where label = :label
- )
- """
- self.deleteArgs = ['product','label']
-
- self.insertQuery = """\
- insert into rhnServiceServerGroupMap (
- product_id, group_type, quantity, paid
- ) (
- select rp.product_id,
- sgt.id,
- :quantity,
- :paid
- from rh_product rp,
- rhnServerGroupType sgt
- where sgt.label = :label
- and rp.item_code = :product
- )
- """
- self.insertArgs = ['product','label','quantity','paid']
-
- self.hkQuery = """\
- select 1
- from rhnServiceServerGroupMap
- where product_id = (
- select product_id
- from rh_product
- where item_code = :product
- )
- and group_type = (
- select id
- from rhnServerGroupType sgt
- where sgt.label = :label
- """
- self.hkArgs = ['product','label']
-
-class UserGroupMap(MapTable):
- def __init__(self):
- self.deleteQuery = """\
- delete from rhnServiceUserGroupMap
- where product_id = (
- select product_id
- from rh_product
- where item_code = :product
- )
- and group_type = (
- select id
- from rhnUserGroupType
- where label = :label
- )
- """
- self.deleteArgs = ['product','label']
-
- self.insertQuery = """\
- insert into rhnServiceUserGroupMap (
- product_id, group_type, quantity, paid
- ) (
- select rp.product_id,
- ugt.id,
- :quantity,
- :paid
- from rh_product rp,
- rhnUserGroupType ugt
- where ugt.label = :label
- and rp.item_code = :product
- )
- """
- self.insertArgs = ['product','label','quantity','paid']
-
- self.hkQuery = """\
- select 1
- from rhnServiceUserGroupMap
- where product_id = (
- select product_id
- from rh_product
- where item_code = :product
- )
- and group_type = (
- select id
- from rhnUserGroupType ugt
- where ugt.label = :label
- """
- self.hkArgs = ['product','label']
-
-class Service:
- types = {
- 'user_group': {
- 'obj': None,
- 'missing': 'error',
- 'labels': []
- }
- 'server_group': {
- 'obj': None,
- 'missing': 'error',
- 'labels': []
- },
- 'channel_family': {
- 'obj': None,
- 'missing': 'warning',
- 'labels' : []
- }
- }
- firstRun = 0
-
- def populateTypes(self):
- # XXX this needs to get labels for everything from the db
- # and I don't have DB code yet
- pass
-
- def __init__(self, type, label, quantity, paid=None):
- if Service.firstRun == 0:
- self.populateTypes()
- Service.firstRun = 1
-
- if not type in Service.types.keys():
- raise ValueError
- self.type = type
-
- if not label in Service.types[type]['labels']:
- if Service.types[type]['missing'] != 'warning':
- raise InvalidLabel(type, label)
- else:
- print "Warning: %s %s does not exist" % (type, label)
- self.insertable = False
- else:
- self.insertable = True
- self.label = label
-
- self.quantity = quantity
-
- def insert(self):
- creator = Service.types[self.type]['obj']
- creator.populate(self)
-
-class Product:
- def __init__(self, item_code):
- self.item_code = item_code
- self.server_groups = []
- self.user_groups = []
- self.channel_families = []
-
- def setServerGroup(self, group_label, quantity):
- if error_on_dupes != 0 and self.server_groups.has_key(group_label):
- raise
- self.server_groups[group_label] = quantity
-
- def setUserGroup(self, group_label, quantity):
- self.user_groups[group_label] = quantity
-
- def setChannelFamily(self, family_label, quantity):
- self.channel_families[family_label] = quantity
-
-if __name__ == "__main__":
- parseArgs()
- readConfig()
- doAction()
-
- # the plan:
- # a Product has several services. We read the config file and make a map
- # of all of the services for all products. Then we look for the one(s)
- # we're asked to poll, we update them, and then we repoll the users.
- # XXX we need to be able to repoll the users for multiple products at once.
- # XXX status/pct complete messages would be nice.
-
-
14 years, 5 months
3 commits - backend/server backend/spacewalk-backend.spec schema/spacewalk
by Jan Pazdziora
backend/server/Makefile | 1
backend/server/rhnItem.py | 425 -----------------------
backend/spacewalk-backend.spec | 1
schema/spacewalk/common/tables/tables.deps | 1
schema/spacewalk/common/views/views.deps | 17
schema/spacewalk/oracle/packages/packages.deps | 1
schema/spacewalk/postgres/packages/packages.deps | 1
7 files changed, 6 insertions(+), 441 deletions(-)
New commits:
commit 0b5ffd92dc2ba9e634f3d14c9fb510edea864445
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Dec 11 13:36:29 2009 +0100
The server.rhnItem seems to be dead code in Spacewalk 0.7, removing.
diff --git a/backend/server/Makefile b/backend/server/Makefile
index 776fb63..1f91e5f 100644
--- a/backend/server/Makefile
+++ b/backend/server/Makefile
@@ -16,7 +16,6 @@ FILES = __init__ \
rhnDependency \
rhnAction \
rhnHandler rhnImport rhnMapping rhnLib rhnPackage \
- rhnItem \
rhnKickstart \
rhnPackageUpload basePackageUpload rhnRepository \
rhnSession rhnUser rhnVirtualization taskomatic
diff --git a/backend/server/rhnItem.py b/backend/server/rhnItem.py
deleted file mode 100644
index 826d0ca..0000000
--- a/backend/server/rhnItem.py
+++ /dev/null
@@ -1,425 +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.
-#
-#
-
-import string
-
-from common import rhnFault
-import rhnSQL
-
-# The main class for representing an RHN Item, or sku.
-class rhnItem:
- def __init__(self, name):
-
- # corrosponds to rh_product.item_code
- self.name = string.upper(name)
-
- # These vars represent the columns on the mapping tables in the db.
- self.channel_families = {}
- self.roles = {}
- self.services = {}
- self.paid = 'P'
-
- # TODO: Can we refactor the 3 add_* functions into a single function?
- ##
- # Adds a service to an Item.
- # A service is either:
- # provisioning_entitled
- # enterprise_entitled
- # sw_mgr_entitled
- # monitoring_entitled
- # nonlinux_entitled
- def add_service(self, name, quantity):
-
- if quantity != '' and quantity != None:
- quantity = int(quantity)
-
- # If the item already has a service of this name, issue a warning.
- # TODO: throw an exception based on a passed in option instead.
- if self.services.has_key(name):
- print "Warning: %s has more than one entry for service %s. " % (
- self.name, name ),
- if quantity == '':
- print "Setting to null."
- else:
- print "Setting to %s." % (quantity,)
-
- # Add the service to our member dict
- self.services[name] = quantity
-
- # if verbose >= 3:
- # print " adding %s %s services to %s" % (
- # quantity, name, self.name)
-
- ##
- # Similiar to add_service, except this is for user group types
- def add_role(self, name, quantity):
- if quantity != '' and quantity != None:
- quantity = int(quantity)
-
- if self.roles.has_key(name):
- print "Warning: %s has more than one entry for role %s. " % (
- self.name, name ),
- if quantity == '':
- print "Setting to null."
- else:
- print "Setting to %s." % (quantity,)
-
- self.roles[name] = quantity
-
- # if verbose >= 3:
- # print " adding %s %s roles to %s" % (
- # quantity, name, self.name)
-
- ##
- # Similiar to add_service, except this is for channel families.
- def add_channel_family(self, name, quantity):
- if quantity != '':
- quantity = int(quantity)
-
- if self.channel_families.has_key(name):
- print "Warning: %s has more than one entry for family %s. " % (
- self.name, name ),
- if quantity == '':
- print "Setting to null."
- else:
- print "Setting to %s." % (quantity,)
-
- self.channel_families[name] = quantity
-
- # if verbose >= 3:
- # print " adding %s %s channel families to %s" % (
- # quantity, name, self.name)
-
- # TODO: refactor these into a single function.
- ##
- # These next three functions display the entitlements
- # for the item.
- def __show_channel_family(self, name, label, quantity, paid):
- return "1,\"%s\",\"%s\",,,%s,\"%s\"\n" % (name, label, quantity, paid)
-
- def __show_service(self, name, label, quantity, paid):
- return "1,\"%s\",,\"%s\",,%s,\"%s\"\n" % (name, label, quantity, paid)
-
- def __show_role(self, name, label, quantity, paid):
- return "1,\"%s\",,,\"%s\",%s,\"%s\"\n" % (name, label, quantity, paid)
-
- ##
- # Formats the output of an item's entitlements all pretty.
- def show(self, item):
-
- results = ''
-
- # Cycle through each of the types of entitlements, and append the
- # output to results.
- for label in item.channel_families.keys():
- results = results + item.__show_channel_family(
- item.name, label, item.channel_families[label], item.paid )
- for label in item.services.keys():
- results = results + item.__show_service(
- item.name, label, item.services[label], item.paid )
- for label in item.roles.keys():
- results = results + item.__show_role(
- item.name, label, item.roles[label], item.paid )
-
- return results
-
- def diff(self, other):
- results = ''
- families = {}
- for label in [] + self.channel_families.keys() \
- + other.channel_families.keys():
- families[label] = 1
-
- for label in families.keys():
- if not self.channel_families.has_key(label):
- self.channel_families[label] = None
-
- if not other.channel_families.has_key(label):
- other.channel_families[label] = None
-
- different = 0
- if self.paid != other.paid:
- different = 1
- if self.channel_families[label] != other.channel_families[label]:
- different = 1
-
- if different:
- if not self.channel_families[label] is None:
- results = results + "-%s" % (self.__show_channel_family(
- self.name, label, self.channel_families[label],
- self.paid ),)
- if not other.channel_families[label] is None:
- results = results + "+%s" % (self.__show_channel_family(
- other.name, label, other.channel_families[label],
- other.paid ),)
- else:
- results = results + " %s" % (self.__show_channel_family(
- self.name, label, self.channel_families[label],
- self.paid ),)
-
- services = {}
- for label in [] + self.services.keys() + other.services.keys():
- services[label] = 1
-
- for label in services.keys():
- if not self.services.has_key(label):
- self.services[label] = None
-
- if not other.services.has_key(label):
- other.services[label] = None
-
- different = 0
- if self.paid != other.paid:
- different = 1
- if self.services[label] != other.services[label]:
- different = 1
-
- if different:
- if not self.services[label] is None:
- results = results + "-%s" % (self.__show_service(
- self.name, label, self.services[label], self.paid),)
- if not other.services[label] is None:
- results = results + "+%s" % (self.__show_service(
- other.name, label, other.services[label], other.paid),)
- else:
- results = results + " %s" % (self.__show_service(
- self.name, label, self.services[label], self.paid),)
-
- roles = {}
- for label in [] + self.roles.keys() + other.roles.keys():
- roles[label] = 1
-
- for label in roles.keys():
- if not self.roles.has_key(label):
- self.roles[label] = None
-
- if not other.roles.has_key(label):
- other.roles[label] = None
-
- different = 0
- if self.paid != other.paid:
- different = 1
- if self.roles[label] != other.roles[label]:
- different = 1
-
- if different:
- if not self.roles[label] is None:
- results = results + "-%s" % (self.__show_role(
- self.name, label, self.roles[label], self.paid ),)
- if not other.roles[label] is None:
- results = results + "+%s" % (self.__show_role(
- other.name, label, other.roles[label], other.paid ),)
- else:
- results = results + " %s" % (self.__show_role(
- self.name, label, self.roles[label], self.paid ),)
-
- return results
-
-
-def get_item_from_db(sku = None):
- retlist = []
-
- h = None
- args = {}
- q = """\
- select * from (
- select rp.item_code item_code, 'S' type,
- sgt.label label, ssgm.quantity quantity,
- ssgm.paid paid
- from rh_product rp, rhnServerGroupType sgt,
- rhnServiceServerGroupMap ssgm
- where ssgm.product_id = rp.product_id
- and ssgm.group_type = sgt.id
- union all
- select rp.item_code, 'R', ugt.label, sugm.quantity, sugm.paid
- from rh_product rp, rhnUserGroupType ugt,
- rhnServiceUserGroupMap sugm
- where sugm.product_id = rp.product_id
- and sugm.group_type = ugt.id
- union all
- select rp.item_code, 'C', cf.label, scfm.quantity, ''
- from rh_product rp, rhnChannelFamily cf,
- rhnServiceChannelFamilyMap scfm
- where scfm.product_id = rp.product_id
- and scfm.family_id = cf.id
- )
- """
- if sku:
- q = q + " where item_code = :sku"
- args['sku'] = sku
- q = q + " order by item_code, type"
-
- h = rhnSQL.prepare(q)
- apply(h.execute, (), args)
- last_item_code = None
- item = None
-
- for row in h.fetchall_dict() or []:
- if row['item_code'] != last_item_code:
- if item and last_item_code:
- retlist.append(item)
- last_item_code = row['item_code']
- item = rhnItem(row['item_code'])
- if row['paid']:
- item.paid = row['paid']
- if row['quantity'] and (not row['quantity'] == ''):
- row['quantity'] = int(row['quantity'])
- if row['type'] == 'S':
- item.add_service(row['label'], row['quantity'])
- if row['type'] == 'R':
- item.add_role(row['label'], row['quantity'])
- if row['type'] == 'C':
- item.add_channel_family(row['label'], row['quantity'])
- if item:
- retlist.append(item)
- return retlist
-
-##
-# Creates a dictionary object called items that represents the input
-# we are passed in, which is a csv from the client.
-#
-# The keys of items is the SKU, the values are rhnItems objects.
-#
-def create_from_lines(lines):
-
- items = {}
-
- for line in lines:
- if not line['SKU']:
- continue
- sku = string.upper(line['SKU'])
- del line['SKU']
- if not items.has_key(sku):
- items[sku] = rhnItem(sku)
- item = items[sku]
-
- if line['paid?']:
- item.paid = line['paid?']
- if line['channel']:
- item.add_channel_family(line['channel'], line['qty'])
- if line['service']:
- item.add_service(line['service'], line['qty'])
- if line['role']:
- item.add_role(line['role'], line['qty'])
-
- # do we really need this?
- items[sku] = item
-
- return items
-
-def map_item_entitlements(item):
-
- # Clear all the old mappings for item
- sqlCall("rhn_ep.clear_item_mappings")(item.name)
-
- ##
- # For each of roles, services, and channel families, cycle through
- # each and call the appropriate stored procedure to update the mappings
- # for the item
- #
- for role in item.roles.keys():
- try:
- sqlCall("rhn_ep.item_add_usergroup")( item.name, role,
- item.roles[role], item.paid )
- except rhnSQL.sql_base.SQLSchemaError, e:
- if e[0] == 20248:
- raise rhnFault(5001, "Invalid item code '%s'" % item.name)
- elif e[0] == 20264:
- raise rhnFault(5002, "Invalid user role '%s'" % role + \
- "while processing '%s'" % item.name)
- else:
- raise
-
- for service in item.services.keys():
- try:
- sqlCall("rhn_ep.item_add_servergroup")( item.name, service,
- item.services[service], item.paid )
- except rhnSQL.sql_base.SQLSchemaError, e:
- if e[0] == 20248:
- raise rhnFault(5001, "Invalid item code '%s'" % item.name)
- elif e[0] == 20249:
- raise rhnFault(5003, "Invalid server group '%s' " % service + \
- "while processing '%s'" % item.name)
- else:
- raise
-
- for family in item.channel_families.keys():
- try:
- sqlCall("rhn_ep.item_add_channel_family")( item.name, family,
- item.channel_families[family] )
- except rhnSQL.sql_base.SQLSchemaError, e:
- if e[0] == 20248:
- raise rhnFault(5001, "Invalid item code '%s'" % item.name)
- elif e[0] == 20250:
- raise rhnFault(5004, "Invalid channel family '%s' " % family + \
- "while processing '%s'" % item.name)
- else:
- raise
-
- return
-
-
-##
-# Wrapper for rhn_ep.count_repoll_orgs.
-# Returns the number of orgs affected by a repoll of item
-#
-def count_orgs_affected(item):
-
- count_orgs = sqlCall("rhn_ep.count_repoll_orgs", rhnSQL.types.STRING())
- count = count_orgs(item)
-
- return count
-
-##
-# Wrapper around rhn_ep.entitlement_queue_pending
-# Returns the number of orgs in the entitlement queue
-#
-def queue_pending():
-
- pending = sqlCall("rhn_ep.entitlement_queue_pending",
- rhnSQL.types.STRING())
-
- return pending()
-
-##
-# Wrapper around rhn_ep.schedule_product_repoll
-# Enqueues all orgs into the entitlement queue that are affected by
-# a repoll of item
-#
-def queue_item(item):
-
- queue = sqlCall("rhn_ep.schedule_product_repoll")
- queue(item)
-
- return
-
-##
-# A wrapper class for making a sql func/proc call.
-# TODO: Is this needed?
-#
-# No it ain/t. get rid of it
-class sqlCall:
- def __init__(self, name, type=None):
- self.name = name
- self.type = type
-
- if self.type is None:
- self.proc = rhnSQL.Procedure(name)
- else:
- self.proc = rhnSQL.Function(name, type)
-
- def __call__(self, *args):
- return apply(self.proc, args, {})
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 65c04a1..15d2703 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -337,7 +337,6 @@ rm -f %{rhnconf}/rhnSecret.py*
%{rhnroot}/server/rhnKickstart.py*
%{rhnroot}/server/rhnDatabaseCache.py*
%{rhnroot}/server/rhnDependency.py*
-%{rhnroot}/server/rhnItem.py*
%{rhnroot}/server/rhnPackage.py*
%{rhnroot}/server/rhnPackageUpload.py*
%{rhnroot}/server/basePackageUpload.py*
commit 8bbba3b95cbc4e5769a37d45921e90c7ba944028
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Dec 11 13:29:51 2009 +0100
Table web_cp_service_line does not exist in Spacewalk 0.7, removing deads deps.
diff --git a/schema/spacewalk/common/views/views.deps b/schema/spacewalk/common/views/views.deps
index ce30a0d..4d7d679 100644
--- a/schema/spacewalk/common/views/views.deps
+++ b/schema/spacewalk/common/views/views.deps
@@ -54,8 +54,7 @@ rhnExpiringTrialMail :: rhnServerGroupType rh_product \
web_user_site_info web_user_personal_info \
web_user_contact_permission web_contact \
rhnUserGroupMembers rhnUserGroup \
- rhnServiceServerGroupMap \
- web_cp_service_line
+ rhnServiceServerGroupMap
rhnFreeErrataMail :: rhnChannelErrata rhnServerChannel \
rhnServerGroupMembers rhnServerGroup \
rhnServer web_contact rhnErrata \
@@ -86,12 +85,9 @@ rhnServerGroupOVLiteHelper :: rhnServerNeededPackageCache rhnErrata \
rhnServerErrataTypeView :: rhnServerNeededErrataCache
rhnServerOutdatedPackages :: rhnServerNeededPackageCache rhnErrata \
rhnPackageName rhnPackageEVR rhnPackage
-rhnServiceLineChannelView :: web_cp_service_line \
- rhnServiceChannelFamilyMap
-rhnServiceLineServerGroup :: web_cp_service_line \
- rhnServerGroupType rhnServiceServerGroupMap
-rhnServiceLineUserGroup :: web_cp_service_line \
- rhnUserGroupType rhnServiceUserGroupMap
+rhnServiceLineChannelView :: rhnServiceChannelFamilyMap
+rhnServiceLineServerGroup :: rhnServerGroupType rhnServiceServerGroupMap
+rhnServiceLineUserGroup :: rhnUserGroupType rhnServiceUserGroupMap
rhnServices :: rhnServiceChannelFamilyMap \
rhnServiceServerGroupMap \
rhnServiceUserGroupMap
diff --git a/schema/spacewalk/oracle/packages/packages.deps b/schema/spacewalk/oracle/packages/packages.deps
index 82e592c..ed1e5e5 100644
--- a/schema/spacewalk/oracle/packages/packages.deps
+++ b/schema/spacewalk/oracle/packages/packages.deps
@@ -53,7 +53,6 @@ rhn_external_api.pkb :: rh_product web_contact xxrh_eproxy_api
rhn_ep.pkb :: rhn_bel.pks rhn_channel.pks rhn_entitlements.pks rhn_exception.pks \
rhn_quota web_contact web_customer rh_product \
web_user_order web_user_order_line \
- web_cp_service_line \
rhnServiceServerGroupMap rhnServerGroupType \
rhnServiceUserGroupMap rhnUserGroupType \
rhnChannelFamily rhnServiceChannelFamilyMap \
diff --git a/schema/spacewalk/postgres/packages/packages.deps b/schema/spacewalk/postgres/packages/packages.deps
index c4da76d..8b32a1a 100644
--- a/schema/spacewalk/postgres/packages/packages.deps
+++ b/schema/spacewalk/postgres/packages/packages.deps
@@ -52,7 +52,6 @@ rhn_external_api.pkb :: rh_product web_contact xxrh_eproxy_api
rhn_ep.pkb :: rhn_bel.pks rhn_channel.pks rhn_entitlements.pks rhn_exception.pks \
rhn_quota web_contact web_customer rh_product \
web_user_order web_user_order_line \
- web_cp_service_line \
rhnServiceServerGroupMap rhnServerGroupType \
rhnServiceUserGroupMap rhnUserGroupType \
rhnChannelFamily rhnServiceChannelFamilyMap \
commit 6392876d67011e4080dbf3d1051546a54fea0d54
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Dec 11 13:20:31 2009 +0100
Table web_customer_product does not exist in Spacewalk 0.7, removing deads deps.
diff --git a/schema/spacewalk/common/tables/tables.deps b/schema/spacewalk/common/tables/tables.deps
index 2d9fdcd..a53bccc 100644
--- a/schema/spacewalk/common/tables/tables.deps
+++ b/schema/spacewalk/common/tables/tables.deps
@@ -305,4 +305,3 @@ web_contact :: web_customer
web_user_contact_permission :: web_contact
web_user_site_info :: web_contact web_user_site_type
web_user_personal_info :: web_contact web_user_prefix
-web_customer_product :: rh_product
diff --git a/schema/spacewalk/common/views/views.deps b/schema/spacewalk/common/views/views.deps
index 290506f..ce30a0d 100644
--- a/schema/spacewalk/common/views/views.deps
+++ b/schema/spacewalk/common/views/views.deps
@@ -55,7 +55,7 @@ rhnExpiringTrialMail :: rhnServerGroupType rh_product \
web_user_contact_permission web_contact \
rhnUserGroupMembers rhnUserGroup \
rhnServiceServerGroupMap \
- web_customer_product web_cp_service_line
+ web_cp_service_line
rhnFreeErrataMail :: rhnChannelErrata rhnServerChannel \
rhnServerGroupMembers rhnServerGroup \
rhnServer web_contact rhnErrata \
@@ -86,11 +86,11 @@ rhnServerGroupOVLiteHelper :: rhnServerNeededPackageCache rhnErrata \
rhnServerErrataTypeView :: rhnServerNeededErrataCache
rhnServerOutdatedPackages :: rhnServerNeededPackageCache rhnErrata \
rhnPackageName rhnPackageEVR rhnPackage
-rhnServiceLineChannelView :: web_customer_product web_cp_service_line \
+rhnServiceLineChannelView :: web_cp_service_line \
rhnServiceChannelFamilyMap
-rhnServiceLineServerGroup :: web_customer_product web_cp_service_line \
+rhnServiceLineServerGroup :: web_cp_service_line \
rhnServerGroupType rhnServiceServerGroupMap
-rhnServiceLineUserGroup :: web_customer_product web_cp_service_line \
+rhnServiceLineUserGroup :: web_cp_service_line \
rhnUserGroupType rhnServiceUserGroupMap
rhnServices :: rhnServiceChannelFamilyMap \
rhnServiceServerGroupMap \
@@ -98,8 +98,7 @@ rhnServices :: rhnServiceChannelFamilyMap \
rhnStorageDevice :: rhnDevice
rhnUserAvailableChannels :: rhn_channel.pks rhnServerChannel \
rhnUserChannelTreeView rhnUserServerPerms
-rhnUserAvailableUpgrades :: rhnServiceServerGroupMap rhnServerGroupType \
- web_customer_product
+rhnUserAvailableUpgrades :: rhnServiceServerGroupMap rhnServerGroupType
rhnUserChannel :: rhn_channel.pks rhnChannelFamilyMembers \
rhnUserChannelFamilyPerms web_contact
rhnUserChannelTreeView :: rhnChannel rhnChannelFamilyMembers \
@@ -127,7 +126,7 @@ rhn_host_monitoring :: rhnServer rhnServerNetInterface \
rhn_interface_monitoring \
rhn_server_monitoring_info
web_customer_orders :: web_user_order web_user_order_line \
- rh_product web_customer_product web_contact
+ rh_product web_contact
rhnSharedChannelView :: rhnChannel rhnChannelTrust rhnTrustedOrgs
rhnSharedChannelTreeView :: rhnSharedChannelView
rhnUserActionOverview :: rhnActionStatus rhnUserServerPerms rhnServerAction \
diff --git a/schema/spacewalk/oracle/packages/packages.deps b/schema/spacewalk/oracle/packages/packages.deps
index 2490128..82e592c 100644
--- a/schema/spacewalk/oracle/packages/packages.deps
+++ b/schema/spacewalk/oracle/packages/packages.deps
@@ -53,7 +53,7 @@ rhn_external_api.pkb :: rh_product web_contact xxrh_eproxy_api
rhn_ep.pkb :: rhn_bel.pks rhn_channel.pks rhn_entitlements.pks rhn_exception.pks \
rhn_quota web_contact web_customer rh_product \
web_user_order web_user_order_line \
- web_customer_product web_cp_service_line \
+ web_cp_service_line \
rhnServiceServerGroupMap rhnServerGroupType \
rhnServiceUserGroupMap rhnUserGroupType \
rhnChannelFamily rhnServiceChannelFamilyMap \
diff --git a/schema/spacewalk/postgres/packages/packages.deps b/schema/spacewalk/postgres/packages/packages.deps
index ba053ea..c4da76d 100644
--- a/schema/spacewalk/postgres/packages/packages.deps
+++ b/schema/spacewalk/postgres/packages/packages.deps
@@ -52,7 +52,7 @@ rhn_external_api.pkb :: rh_product web_contact xxrh_eproxy_api
rhn_ep.pkb :: rhn_bel.pks rhn_channel.pks rhn_entitlements.pks rhn_exception.pks \
rhn_quota web_contact web_customer rh_product \
web_user_order web_user_order_line \
- web_customer_product web_cp_service_line \
+ web_cp_service_line \
rhnServiceServerGroupMap rhnServerGroupType \
rhnServiceUserGroupMap rhnUserGroupType \
rhnChannelFamily rhnServiceChannelFamilyMap \
14 years, 5 months