2
0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-06-04 20:40:09 +00:00

Merge pull request #6149 from neo954/rhels8-foo

Fix python error, TabError: inconsistent use of tabs and spaces in indentation
This commit is contained in:
yangsong 2019-03-21 16:31:14 +08:00 committed by GitHub
commit efd954b36f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions

View File

@ -394,7 +394,7 @@ sub subvars {
$inc =~ s/#COLONHTTPPORT#/$httpportsuffix/eg;
if (($::XCATSITEVALS{xcatdebugmode} eq "1") or ($::XCATSITEVALS{xcatdebugmode} eq "2")) {
$inc =~ s/#UNCOMMENTOENABLEDEBUGPORT#/ /g;
$inc =~ s/#UNCOMMENTOENABLEDEBUGPORT#//g;
}
if ($::XCATSITEVALS{xcatdebugmode} eq "2") {

View File

@ -116,8 +116,8 @@ try:
#UNCOMMENTOENABLEDEBUGPORT# newcommand = b""
#UNCOMMENTOENABLEDEBUGPORT# for i in command[1:]:
#UNCOMMENTOENABLEDEBUGPORT# newcommand = newcommand + i + b" "
#UNCOMMENTOENABLEDEBUGPORT# output = os.popen(newcommand.decode('utf-8')).read()
#UNCOMMENTOENABLEDEBUGPORT# newSocket.send(output.encode())
#UNCOMMENTOENABLEDEBUGPORT# output = os.popen(newcommand.decode('utf-8')).read().encode()
#UNCOMMENTOENABLEDEBUGPORT# newSocket.send(output)
#UNCOMMENTOENABLEDEBUGPORT# break
if(command[0] == b"screendump"):
newcommand = "cat /dev/vcs"