Skip to content

Commit 223bd73

Browse files
committed
CLOS-4056: replace em-dashes with ASCII for Python 2.7 / lint compat
The previous two commits introduced em-dashes (U+2014) in docstrings and inline comments. The upstream make lint target now greps for any non-ASCII byte (commit 92aee84) because Python 2.7 source files reject non-ASCII without an encoding declaration, and the leapp framework still supports running on 2.7 in places. Replace each em-dash with an ASCII hyphen so the files lint clean against that gate.
1 parent b020105 commit 223bd73

5 files changed

Lines changed: 10 additions & 10 deletions

File tree

repos/system_upgrade/cloudlinux/actors/checkrhnversionoverride/actor.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class CheckRhnVersionOverride(Actor):
2121
def process(self):
2222
if not is_cln_package_channel_active():
2323
# CLOS-4056: versionOverride only matters when CLN is delivering
24-
# packages the upgrade rewrites it to drive channel selection.
24+
# packages - the upgrade rewrites it to drive channel selection.
2525
# On no-auth (SWNG) systems the package channel is cl-channel,
2626
# not CLN, so there is nothing to inspect or warn about even if
2727
# /etc/sysconfig/rhn/up2date is still present from registration.

repos/system_upgrade/cloudlinux/actors/pinclnmirror/actor.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ def process(self):
2929
if not is_cln_package_channel_active():
3030
# CLOS-4056: pinning the CLN mirror is only meaningful when CLN
3131
# is delivering packages. On no-auth (SWNG) systems packages come
32-
# from cl-channel via mirrorlist, so there is nothing to pin
32+
# from cl-channel via mirrorlist, so there is nothing to pin -
3333
# registration may still be in place but is irrelevant here.
3434
api.current_logger().info(
3535
"CLN is not the active package channel; skipping mirror pinning"

repos/system_upgrade/cloudlinux/actors/resetrhnversionoverride/actor.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ def process(self):
2020
if not is_cln_package_channel_active():
2121
# CLOS-4056: versionOverride is only set/used by the CLN package
2222
# channel flow. If the system isn't on CLN for packages, leave
23-
# /etc/sysconfig/rhn/up2date alone registration metadata there
23+
# /etc/sysconfig/rhn/up2date alone - registration metadata there
2424
# is not ours to touch.
2525
return
2626

repos/system_upgrade/cloudlinux/actors/switchclnchannel/actor.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ class SwitchClnChannel(Actor):
2525
def process(self):
2626
if not is_cln_package_channel_active():
2727
# CLOS-4056: CLN is no longer the package channel here (no-auth /
28-
# SWNG mode). Skipping the channel switch is correct packages
28+
# SWNG mode). Skipping the channel switch is correct - packages
2929
# come from cl-channel / cloudlinux9-baseos instead. The system
3030
# may still be CLN-registered for licensing; that is a separate
3131
# concern this actor does not need to manage.
@@ -40,7 +40,7 @@ def process(self):
4040
# CLOS-4056: Do not inhibit. Even on systems that ARE using CLN
4141
# as the package channel, a transient CLN-server reachability
4242
# problem at FirstBoot (DNS/network not up yet) shouldn't block
43-
# the upgrade the no-auth fallback repos still serve packages.
43+
# the upgrade - the no-auth fallback repos still serve packages.
4444
reporting.create_report(
4545
[
4646
reporting.Title(
@@ -50,7 +50,7 @@ def process(self):
5050
"Command {} failed with exit code {}."
5151
" The most probable cause of that is a problem with this system's"
5252
" CloudLinux Network registration. If this system now uses the"
53-
" no-auth (SWNG) repository scheme, this failure is harmless "
53+
" no-auth (SWNG) repository scheme, this failure is harmless -"
5454
" CL9 packages come from cl-channel / cloudlinux9-baseos instead"
5555
" of CLN.".format(e.command, e.exit_code)
5656
),

repos/system_upgrade/cloudlinux/libraries/cln_detect.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@
22
33
CLN has historically combined two concerns:
44
5-
1. **Registration / identity** the system is registered with the CLN
5+
1. **Registration / identity** - the system is registered with the CLN
66
server (`/etc/sysconfig/rhn/systemid`, JWT token), used for licensing
77
and inventory regardless of how packages are delivered.
88
9-
2. **Package delivery** the system pulls CloudLinux packages through
9+
2. **Package delivery** - the system pulls CloudLinux packages through
1010
the spacewalk DNF/YUM plugin against the CLN-side channel
1111
(`cloudlinux-x86_64-server-N`).
1212
1313
The no-auth (SWNG) transition decouples these. New CL8 and CL9 systems
1414
keep CLN **registration** but no longer use CLN as the **package
15-
channel** packages come from the SWNG mirrorlist via
15+
channel** - packages come from the SWNG mirrorlist via
1616
`/etc/yum.repos.d/cl.repo` (`cl-channel`) instead. `rhn-client-tools
1717
>= 3.0.1` disables the spacewalk plugin to enforce this.
1818
@@ -57,7 +57,7 @@ def is_cln_package_channel_active():
5757
so CLN-targeting actions (channel switch, mirror pinning, version
5858
overrides) are not meaningful and should be skipped.
5959
60-
This is a deliberately heuristic check it asks "is CLN going to
60+
This is a deliberately heuristic check - it asks "is CLN going to
6161
serve packages here", not "is the system registered with CLN" (the
6262
two were the same thing pre-no-auth and have since diverged).
6363
"""

0 commit comments

Comments
 (0)