utils/spacewalk-sync-setup
by Grant Gainey
utils/spacewalk-sync-setup | 1 -
1 file changed, 1 deletion(-)
New commits:
commit 35723e2a43cd7394a0e9530bdd422401359f5beb
Author: Grant Gainey <ggainey(a)redhat.com>
Date: Wed Aug 28 12:57:20 2013 -0400
1002232 - remove extraneous error-log invoke
diff --git a/utils/spacewalk-sync-setup b/utils/spacewalk-sync-setup
index 4f44a35..03a7845 100755
--- a/utils/spacewalk-sync-setup
+++ b/utils/spacewalk-sync-setup
@@ -149,7 +149,6 @@ def initializeConfig(opt, handle):
slave_stanza = slave_stanza.replace('PASSWORD', opt.slave_password)
if 'slave_file' in opt.__dict__:
- logging.error(opt.slave_file)
slave_stanza = slave_stanza.replace('SLAVE_FILE', opt.slave_file)
if 'master' in opt.__dict__:
10 years, 8 months
Changes to 'refs/tags/spacewalk-java-2.1.29-1'
by Tomas Lestach
Tag 'spacewalk-java-2.1.29-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2013-08-28 16:32 +0000
Tagging package [spacewalk-java] version [2.1.29-1] in directory [java/].
Changes since rhn-client-tools-2.1.4-1:
Johannes Renner (1):
Fix javascript "Uncaught TypeError"
Tomas Lestach (2):
add additional check for cases, when pam is disabled
Automatic commit of package [spacewalk-java] release [2.1.29-1].
---
java/code/webapp/WEB-INF/pages/user/create/usercreate.jsp | 3 ++-
java/spacewalk-java.spec | 12 +++++++++++-
rel-eng/packages/spacewalk-java | 2 +-
3 files changed, 14 insertions(+), 3 deletions(-)
---
10 years, 8 months
3 commits - java/code java/spacewalk-java.spec rel-eng/packages
by Tomas Lestach
java/code/webapp/WEB-INF/pages/user/create/usercreate.jsp | 3 ++-
java/spacewalk-java.spec | 12 +++++++++++-
rel-eng/packages/spacewalk-java | 2 +-
3 files changed, 14 insertions(+), 3 deletions(-)
New commits:
commit 2bba0c5765e7ab4795b74232fe1a7b2c28e464e9
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Aug 28 18:32:07 2013 +0200
Automatic commit of package [spacewalk-java] release [2.1.29-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index cb0ca76..bf43a8b 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -28,7 +28,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 2.1.28
+Version: 2.1.29
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -771,6 +771,16 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Wed Aug 28 2013 Tomas Lestach <tlestach(a)redhat.com> 2.1.29-1
+- add additional check for cases, when pam is disabled
+- Fix javascript "Uncaught TypeError"
+- 1001826 - fixing the java code as well
+- 1001551 - fix kickstart repositories selection
+- 998944 - fix package removal via ssm
+- removing @Override annotation from methods that aren't overriden
+- removing @Override annotation from method that isn't overriden
+- remove unnecessary cast
+
* Fri Aug 23 2013 Tomas Lestach <tlestach(a)redhat.com> 2.1.28-1
- 989275 - fix ISE when changing base channel with korean locale prefs
- 993047 - adding missing space after dot in translation strings
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 573757f..946e567 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-2.1.28-1 java/
+2.1.29-1 java/
commit 607c044e0f7aa252c62f102aae97f400cc899d5a
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Aug 28 18:24:51 2013 +0200
add additional check for cases, when pam is disabled
diff --git a/java/code/webapp/WEB-INF/pages/user/create/usercreate.jsp b/java/code/webapp/WEB-INF/pages/user/create/usercreate.jsp
index 0231ac4..35ad0d3 100644
--- a/java/code/webapp/WEB-INF/pages/user/create/usercreate.jsp
+++ b/java/code/webapp/WEB-INF/pages/user/create/usercreate.jsp
@@ -183,7 +183,8 @@
--%>
<script language="javascript">
var items = document.getElementsByName('password-asterisk');
- if (document.getElementById('pam').checked == true) {
+ if (document.getElementById('pam')
+ && document.getElementById('pam').checked == true) {
for (var i = 0; i < items.length; i++) {
items[i].style.display = "none";
}
commit b5489397536d2b400cdad6376886c579435d82f7
Author: Johannes Renner <jrenner(a)suse.de>
Date: Tue Aug 27 12:19:48 2013 +0200
Fix javascript "Uncaught TypeError"
diff --git a/java/code/webapp/WEB-INF/pages/user/create/usercreate.jsp b/java/code/webapp/WEB-INF/pages/user/create/usercreate.jsp
index 3062d83..0231ac4 100644
--- a/java/code/webapp/WEB-INF/pages/user/create/usercreate.jsp
+++ b/java/code/webapp/WEB-INF/pages/user/create/usercreate.jsp
@@ -183,7 +183,7 @@
--%>
<script language="javascript">
var items = document.getElementsByName('password-asterisk');
- if (document.userCreateForm.usepam.checked == true) {
+ if (document.getElementById('pam').checked == true) {
for (var i = 0; i < items.length; i++) {
items[i].style.display = "none";
}
10 years, 8 months
Changes to 'refs/tags/rhn-client-tools-2.1.4-1'
by Milan Zazrivec
Tag 'rhn-client-tools-2.1.4-1' created by Milan Zazrivec <mzazrivec(a)redhat.com> at 2013-08-28 16:01 +0000
Tagging package [rhn-client-tools] version [2.1.4-1] in directory [client/rhel/rhn-client-tools/].
Changes since rhncfg-5.10.56-1:
Milan Zazrivec (2):
No firstboot modules on RHEL 7 and later
Automatic commit of package [rhn-client-tools] release [2.1.4-1].
---
client/rhel/rhn-client-tools/rhn-client-tools.spec | 18 ++++++++++++++++--
rel-eng/packages/rhn-client-tools | 2 +-
2 files changed, 17 insertions(+), 3 deletions(-)
---
10 years, 8 months
2 commits - client/rhel rel-eng/packages
by Milan Zazrivec
client/rhel/rhn-client-tools/rhn-client-tools.spec | 18 ++++++++++++++++--
rel-eng/packages/rhn-client-tools | 2 +-
2 files changed, 17 insertions(+), 3 deletions(-)
New commits:
commit fecb588641d1fced62e0ce8f94f447e52c8d4b03
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Wed Aug 28 18:01:07 2013 +0200
Automatic commit of package [rhn-client-tools] release [2.1.4-1].
diff --git a/client/rhel/rhn-client-tools/rhn-client-tools.spec b/client/rhel/rhn-client-tools/rhn-client-tools.spec
index 3698b79..f7456a7 100644
--- a/client/rhel/rhn-client-tools/rhn-client-tools.spec
+++ b/client/rhel/rhn-client-tools/rhn-client-tools.spec
@@ -4,7 +4,7 @@ Group: System Environment/Base
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
URL: https://fedorahosted.org/spacewalk
Name: rhn-client-tools
-Version: 2.1.3
+Version: 2.1.4
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -357,6 +357,9 @@ make -f Makefile.rhn-client-tools test
%endif
%changelog
+* Wed Aug 28 2013 Milan Zazrivec <mzazrivec(a)redhat.com> 2.1.4-1
+- No firstboot modules on RHEL 7 and later
+
* Thu Aug 15 2013 Stephen Herr <sherr(a)redhat.com> 2.1.3-1
- 919432 - rhn-client-tools should correctly conflict with old virt-host
versions
diff --git a/rel-eng/packages/rhn-client-tools b/rel-eng/packages/rhn-client-tools
index 6db126e..8d9dbac 100644
--- a/rel-eng/packages/rhn-client-tools
+++ b/rel-eng/packages/rhn-client-tools
@@ -1 +1 @@
-2.1.3-1 client/rhel/rhn-client-tools/
+2.1.4-1 client/rhel/rhn-client-tools/
commit 4742ea5b6be848346ac5323ce626f9500765d7fa
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Wed Aug 28 17:57:07 2013 +0200
No firstboot modules on RHEL 7 and later
diff --git a/client/rhel/rhn-client-tools/rhn-client-tools.spec b/client/rhel/rhn-client-tools/rhn-client-tools.spec
index 0abc350..3698b79 100644
--- a/client/rhel/rhn-client-tools/rhn-client-tools.spec
+++ b/client/rhel/rhn-client-tools/rhn-client-tools.spec
@@ -152,9 +152,18 @@ rm $RPM_BUILD_ROOT%{_datadir}/rhn/up2date_client/hardware_hal.*
rm $RPM_BUILD_ROOT%{_datadir}/rhn/up2date_client/hardware_gudev.*
%endif
-%if 0%{?rhel} > 0 && 0%{?rhel} < 6
+%if 0%{?rhel} > 0
+%if 0%{?rhel} < 6
rm -rf $RPM_BUILD_ROOT%{_datadir}/rhn/up2date_client/firstboot
rm -f $RPM_BUILD_ROOT%{_datadir}/firstboot/modules/rhn_register.*
+%endif
+%if 0%{?rhel} == 6
+rm -rf $RPM_BUILD_ROOT%{_datadir}/firstboot/modules/rhn_*_*.*
+%endif
+%if 0%{?rhel} > 6
+rm -rf $RPM_BUILD_ROOT%{_datadir}/rhn/up2date_client/firstboot
+rm -rf $RPM_BUILD_ROOT%{_datadir}/firstboot/
+%endif
%else
rm -rf $RPM_BUILD_ROOT%{_datadir}/firstboot/modules/rhn_*_*.*
%endif
@@ -317,6 +326,7 @@ make -f Makefile.rhn-client-tools test
%{_datadir}/firstboot/modules/rhn_review_gui.*
%{_datadir}/firstboot/modules/rhn_finish_gui.*
%else
+%if 0%{?rhel} < 7
%{_datadir}/firstboot/modules/rhn_register.*
%{_datadir}/rhn/up2date_client/firstboot/rhn_login_gui.*
%{_datadir}/rhn/up2date_client/firstboot/rhn_start_gui.*
@@ -327,6 +337,7 @@ make -f Makefile.rhn-client-tools test
%{_datadir}/rhn/up2date_client/firstboot/rhn_review_gui.*
%{_datadir}/rhn/up2date_client/firstboot/rhn_finish_gui.*
%endif
+%endif
%if 0%{?suse_version}
# on SUSE these directories are part of packages not installed
10 years, 8 months
Changes to 'refs/tags/rhncfg-5.10.56-1'
by StephenHerr
Tag 'rhncfg-5.10.56-1' created by Stephen Herr <sherr(a)redhat.com> at 2013-08-28 15:54 +0000
Tagging package [rhncfg] version [5.10.56-1] in directory [client/tools/rhncfg/].
Changes since spacewalk-web-2.1.14-1:
Dimitar Yordanov (2):
1001826 - restrictions to channel name (update)
1001826 - fixing the java code as well
Stephen Herr (2):
1002193 - remove spacewalk-backend-libs dependency from rhncfg
Automatic commit of package [rhncfg] release [5.10.56-1].
---
backend/common/fileutils.py | 8 +
client/tools/rhncfg/config_client/rhncfgcli_elist.py | 2
client/tools/rhncfg/config_common/file_utils.py | 51 ++++++++++
client/tools/rhncfg/config_management/rhncfg_diff.py | 2
client/tools/rhncfg/rhncfg.spec | 6 -
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 14 +-
rel-eng/packages/rhncfg | 2
web/html/network/software/channels/manage/edit.pxt | 10 -
web/modules/sniglets/Sniglets/ChannelEditor.pm | 4
9 files changed, 81 insertions(+), 18 deletions(-)
---
10 years, 8 months
2 commits - backend/common client/tools rel-eng/packages
by StephenHerr
backend/common/fileutils.py | 8 ++
client/tools/rhncfg/config_client/rhncfgcli_elist.py | 2
client/tools/rhncfg/config_common/file_utils.py | 51 +++++++++++++++++++
client/tools/rhncfg/config_management/rhncfg_diff.py | 2
client/tools/rhncfg/rhncfg.spec | 6 +-
rel-eng/packages/rhncfg | 2
6 files changed, 66 insertions(+), 5 deletions(-)
New commits:
commit d3a4d70b32f754161105e7e92427cf7ac78947c6
Author: Stephen Herr <sherr(a)redhat.com>
Date: Wed Aug 28 11:54:04 2013 -0400
Automatic commit of package [rhncfg] release [5.10.56-1].
diff --git a/client/tools/rhncfg/rhncfg.spec b/client/tools/rhncfg/rhncfg.spec
index 3e14cf6..93575c1 100644
--- a/client/tools/rhncfg/rhncfg.spec
+++ b/client/tools/rhncfg/rhncfg.spec
@@ -8,7 +8,7 @@ Group: Applications/System
License: GPLv2
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 5.10.55
+Version: 5.10.56
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -120,6 +120,9 @@ fi
# $Id$
%changelog
+* Wed Aug 28 2013 Stephen Herr <sherr(a)redhat.com> 5.10.56-1
+- 1002193 - remove spacewalk-backend-libs dependency from rhncfg
+
* Wed Jul 17 2013 Tomas Kasparek <tkasparek(a)redhat.com> 5.10.55-1
- updating copyright years
diff --git a/rel-eng/packages/rhncfg b/rel-eng/packages/rhncfg
index 3c6db31..8f79cfd 100644
--- a/rel-eng/packages/rhncfg
+++ b/rel-eng/packages/rhncfg
@@ -1 +1 @@
-5.10.55-1 client/tools/rhncfg/
+5.10.56-1 client/tools/rhncfg/
commit 1b384f6f5cbe1a6769a2696b5417471af38a150b
Author: Stephen Herr <sherr(a)redhat.com>
Date: Wed Aug 28 11:21:12 2013 -0400
1002193 - remove spacewalk-backend-libs dependency from rhncfg
diff --git a/backend/common/fileutils.py b/backend/common/fileutils.py
index 290a051..bac640a 100644
--- a/backend/common/fileutils.py
+++ b/backend/common/fileutils.py
@@ -373,6 +373,8 @@ def getUidGid(user=None, group=None):
gid = os.getgid()
return uid, gid
+# Duplicated in client/tools/rhncfg/config_common/file_utils.py to remove dependency
+# requirement. If making changes make them there too.
FILETYPE2CHAR = {
'file' : '-',
'directory' : 'd',
@@ -381,12 +383,16 @@ FILETYPE2CHAR = {
'blockdev' : 'b',
}
+# Duplicated in client/tools/rhncfg/config_common/file_utils.py to remove dependency
+# requirement. If making changes make them there too.
def _ifelse(cond, thenval, elseval):
if cond:
return thenval
else:
return elseval
+# Duplicated in client/tools/rhncfg/config_common/file_utils.py to remove dependency
+# requirement. If making changes make them there too.
def ostr_to_sym(octstr, ftype):
""" Convert filemode in octets (like '644') to string like "ls -l" ("-rwxrw-rw-")
ftype is one of: file, directory, symlink, chardev, blockdev.
@@ -412,6 +418,8 @@ def ostr_to_sym(octstr, ftype):
_ifelse(mode & stat.S_ISVTX, 'T', '-'))
return symstr
+# Duplicated in client/tools/rhncfg/config_common/file_utils.py to remove dependency
+# requirement. If making changes make them there too.
def f_date(dbiDate):
return "%04d-%02d-%02d %02d:%02d:%02d" % (dbiDate.year, dbiDate.month,
dbiDate.day, dbiDate.hour, dbiDate.minute, dbiDate.second)
diff --git a/client/tools/rhncfg/config_client/rhncfgcli_elist.py b/client/tools/rhncfg/config_client/rhncfgcli_elist.py
index 2592d38..637c026 100755
--- a/client/tools/rhncfg/config_client/rhncfgcli_elist.py
+++ b/client/tools/rhncfg/config_client/rhncfgcli_elist.py
@@ -1,5 +1,5 @@
from config_common.rhn_log import log_debug, die
-from spacewalk.common.fileutils import ostr_to_sym
+from config_common.file_utils import ostr_to_sym
import handler_base, base64
class Handler(handler_base.HandlerBase):
diff --git a/client/tools/rhncfg/config_common/file_utils.py b/client/tools/rhncfg/config_common/file_utils.py
index 8f993e0..5766534 100644
--- a/client/tools/rhncfg/config_common/file_utils.py
+++ b/client/tools/rhncfg/config_common/file_utils.py
@@ -210,3 +210,54 @@ def maketemp(prefix=None, directory=None, symlink=None):
open_file = os.fdopen(fd, "w+")
return filename, dirs_created, open_file
+
+# Duplicated from backend/common/fileutils.py to remove dependency requirement.
+# If making changes make them there too.
+FILETYPE2CHAR = {
+ 'file' : '-',
+ 'directory' : 'd',
+ 'symlink' : 'l',
+ 'chardev' : 'c',
+ 'blockdev' : 'b',
+}
+
+# Duplicated from backend/common/fileutils.py to remove dependency requirement.
+# If making changes make them there too.
+def _ifelse(cond, thenval, elseval):
+ if cond:
+ return thenval
+ else:
+ return elseval
+
+# Duplicated from backend/common/fileutils.py to remove dependency requirement.
+# If making changes make them there too.
+def ostr_to_sym(octstr, ftype):
+ """ Convert filemode in octets (like '644') to string like "ls -l" ("-rwxrw-rw-")
+ ftype is one of: file, directory, symlink, chardev, blockdev.
+ """
+ mode = int(str(octstr), 8)
+
+ symstr = FILETYPE2CHAR.get(ftype, '?')
+
+ symstr += _ifelse(mode & stat.S_IRUSR, 'r', '-')
+ symstr += _ifelse(mode & stat.S_IWUSR, 'w', '-')
+ symstr += _ifelse(mode & stat.S_IXUSR,
+ _ifelse(mode & stat.S_ISUID, 's', 'x'),
+ _ifelse(mode & stat.S_ISUID, 'S', '-'))
+ symstr += _ifelse(mode & stat.S_IRGRP, 'r', '-')
+ symstr += _ifelse(mode & stat.S_IWGRP, 'w', '-')
+ symstr += _ifelse(mode & stat.S_IXGRP,
+ _ifelse(mode & stat.S_ISGID, 's', 'x'),
+ _ifelse(mode & stat.S_ISGID, 'S', '-'))
+ symstr += _ifelse(mode & stat.S_IROTH, 'r', '-')
+ symstr += _ifelse(mode & stat.S_IWOTH, 'w', '-')
+ symstr += _ifelse(mode & stat.S_IXOTH,
+ _ifelse(mode & stat.S_ISVTX, 't', 'x'),
+ _ifelse(mode & stat.S_ISVTX, 'T', '-'))
+ return symstr
+
+# Duplicated from backend/common/fileutils.py to remove dependency requirement.
+# If making changes make them there too.
+def f_date(dbiDate):
+ return "%04d-%02d-%02d %02d:%02d:%02d" % (dbiDate.year, dbiDate.month,
+ dbiDate.day, dbiDate.hour, dbiDate.minute, dbiDate.second)
diff --git a/client/tools/rhncfg/config_management/rhncfg_diff.py b/client/tools/rhncfg/config_management/rhncfg_diff.py
index 72a0dd1..d8a2e3a 100644
--- a/client/tools/rhncfg/config_management/rhncfg_diff.py
+++ b/client/tools/rhncfg/config_management/rhncfg_diff.py
@@ -21,7 +21,7 @@ import sys
from config_common import handler_base, utils, cfg_exceptions
from config_common.rhn_log import log_debug, die
-from spacewalk.common.fileutils import f_date, ostr_to_sym
+from config_common.file_utils import f_date, ostr_to_sym
class Handler(handler_base.HandlerBase):
diff --git a/client/tools/rhncfg/rhncfg.spec b/client/tools/rhncfg/rhncfg.spec
index 5061d55..3e14cf6 100644
--- a/client/tools/rhncfg/rhncfg.spec
+++ b/client/tools/rhncfg/rhncfg.spec
@@ -27,7 +27,6 @@ Requires: rhn-client-tools
%endif
%endif
-Requires: spacewalk-backend-libs >= 1.3.32-1
%if 0%{?suse_version}
# provide rhn directories and no selinux on suse
BuildRequires: rhn-client-tools
10 years, 8 months
java/code
by Dimitar Yordanov
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 14 +++++-----
1 file changed, 8 insertions(+), 6 deletions(-)
New commits:
commit 61cf213a5f74dac5b39968b4f4825dcf3c5f680b
Author: Dimitar Yordanov <dyordano(a)redhat.com>
Date: Wed Aug 28 17:25:32 2013 +0200
1001826 - fixing the java code as well
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
index f6dc757..6fe8316 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
@@ -19480,13 +19480,15 @@ given channel.</source>
If the parent channel is set to 'none', the channel is a base channel.
Otherwise, the channel is a child of the specified channel.
<p/>
- Channel name and label are required. They each must be at least 6
- characters in length. Labels must begin with a letter, contain only
- lowercase letters, hyphens ('-'), periods ('.'), underscores ('_'), and
- numerals. Channel name may also contain spaces and forward slashes
- ('/').
+ Channel name and label are required.<br>
+ They each must be at least 6 characters in length.<br>
+ Channel name must not be longer than 256 characters and channel label must not be longer than 128 characters.<br>
+ Channel name must begin with a letter and channel label may begin with a letter or digit.<br>
+ They each must not begin with rhn, redhat or red hat.<br>
+ They each must contain only lowercase letters, hyphens ('-'), periods ('.'), underscores ('_'), and numerals.<br>
+ Channel name may also contain spaces, parentheses () and forward slashes ('/').
<p/>
- Channel summary is also required.
+ Channel summary is also required and must not exceed 500 characters.
</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/channels/manage/Edit.do</context>
10 years, 8 months
web/html web/modules
by Dimitar Yordanov
web/html/network/software/channels/manage/edit.pxt | 10 +++++-----
web/modules/sniglets/Sniglets/ChannelEditor.pm | 4 ++--
2 files changed, 7 insertions(+), 7 deletions(-)
New commits:
commit fa85d1ee7b295826eae6981d9aa27bf6d72e3123
Author: Dimitar Yordanov <dyordano(a)redhat.com>
Date: Wed Aug 28 15:11:54 2013 +0200
1001826 - restrictions to channel name (update)
diff --git a/web/html/network/software/channels/manage/edit.pxt b/web/html/network/software/channels/manage/edit.pxt
index 8285d0d..503893d 100644
--- a/web/html/network/software/channels/manage/edit.pxt
+++ b/web/html/network/software/channels/manage/edit.pxt
@@ -25,12 +25,12 @@
channel. Otherwise, the channel is a child of the specified channel.
</p>
<p>
- Channel name and label are required.
+ Channel name and label are required.<br>
They each must be at least 6 characters in length.<br>
- Channel name must no be longer than 256 characters and channel label must no be longer than 128 characters.<br>
- Channel label may begin with a letter or digit whether channel name must begin with a letter and for both is not allowed to <br>
- begin with rhn, redhat or red hat.<br>
- Further both must contain only lowercase letters, hyphens ('-'), periods ('.'), underscores ('_'), and numerals.<br>
+ Channel name must not be longer than 256 characters and channel label must not be longer than 128 characters.<br>
+ Channel name must begin with a letter and channel label may begin with a letter or digit.<br>
+ They each must not begin with rhn, redhat or red hat.<br>
+ They each must contain only lowercase letters, hyphens ('-'), periods ('.'), underscores ('_'), and numerals.<br>
Channel name may also contain spaces, parentheses () and forward slashes ('/').
</p>
<p>
diff --git a/web/modules/sniglets/Sniglets/ChannelEditor.pm b/web/modules/sniglets/Sniglets/ChannelEditor.pm
index 473993f..1538229 100644
--- a/web/modules/sniglets/Sniglets/ChannelEditor.pm
+++ b/web/modules/sniglets/Sniglets/ChannelEditor.pm
@@ -148,13 +148,13 @@ sub channel_edit_cb {
# bugzilla: 459827 - disallow names longer than 64 characters
unless ($channel_name =~ /^[a-z][\w\d\s\-\.\'\(\)\/\_]*$/i and length($channel_name) >= 6 and length($channel_name) <= 256) {
$pxt->push_message(local_alert => "Invalid channel name '" .
- PXT::Utils->escapeHTML($channel_name) . "' - must be at least 6 characters long and no longer than 256 characters, begin with a letter, and contain only letters, digits, spaces, parentheses, '-', ' / ', '_' and '.'");
+ PXT::Utils->escapeHTML($channel_name) . "' - must be at least 6 characters long and not longer than 256 characters, begin with a letter, and contain only letters, digits, spaces, parentheses, '-', ' / ', '_' and '.'");
$errors++;
}
# bugzilla: 161517 - allow _ in channel labels
unless ($channel_label =~ /^[a-z\d][a-z\d\-\.\_]*$/ and length($channel_label) >= 6 and length($channel_label) <= 128) {
- $pxt->push_message(local_alert => "Invalid channel label '$channel_label' - must be at least 6 characters long and no longer than 128 characters, begin with a letter or digit, and contain only lowercase letters, digits, '-', '_', and '.'");
+ $pxt->push_message(local_alert => "Invalid channel label '$channel_label' - must be at least 6 characters long and not longer than 128 characters, begin with a letter or digit, and contain only lowercase letters, digits, '-', '_', and '.'");
$errors++;
}
10 years, 8 months
Changes to 'refs/tags/spacewalk-web-2.1.14-1'
by Dimitar Yordanov
Tag 'spacewalk-web-2.1.14-1' created by Dimitar Yordanov <dyordano(a)redhat.com> at 2013-08-28 12:40 +0000
Tagging package [spacewalk-web] version [2.1.14-1] in directory [web/].
Changes since spacewalk-backend-2.1.12-1:
Dimitar Yordanov (2):
1001826 - restrictions to channel name
Automatic commit of package [spacewalk-web] release [2.1.14-1].
---
rel-eng/packages/spacewalk-web | 2 +-
web/html/network/software/channels/manage/edit.pxt | 12 ++++++++----
web/modules/sniglets/Sniglets/ChannelEditor.pm | 6 +++---
web/spacewalk-web.spec | 5 ++++-
4 files changed, 16 insertions(+), 9 deletions(-)
---
10 years, 8 months