Skip to content

Commit e290fb6

Browse files
author
ttwoxa
committed
Correct typos
1 parent cc99c88 commit e290fb6

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ sudo rm /usr/bin/zypperoni
6363
Specify the `--debug` option for troubleshooting.
6464
Zypperoni is intended to catch SIGINT (Ctrl+C) and properly cleanup.
6565
If for some reason it does not cleanup such as when receiving SIGTERM or SIGKILL, future operations should not be affected.
66-
Zypperoni keeps its working directory in `/tmp/zypperoni_*`, so a reboot would always cleanup.
66+
Zypperoni keeps it's working directory in `/tmp/zypperoni_*`, so a reboot would always cleanup.
6767
Should zypperoni somehow mess up, it's very simple to clear whatever it has done wrong by doing:
6868
```
6969
sudo rm -rI /var/cache/zypp
@@ -87,4 +87,4 @@ Now you can use `z ref` and `z dup` to refresh repos and perform distribution up
8787
Generally, zypperoni should work out of the box with the default zypp and zypper configs.
8888
Custom or experimental configs may result in bugs.
8989

90-
- Using the experimental option `techpreview.ZYPP_SINGLE_RPMTRANS=1` in `zypp.conf` would result in `zypperoni dup-download` appearing to hang indefinitely, but in reality zypper is doing its sequential download in the background due to RPM single transaction requirements. This config is not necessary when using zypperoni as it passes `ZYPP_SINGLE_RPMTRANS=1` as an environment variable when calling zypper.
90+
- Using the experimental option `techpreview.ZYPP_SINGLE_RPMTRANS=1` in `zypp.conf` would result in `zypperoni dup-download` appearing to hang indefinitely, but in reality zypper is doing it's sequential download in the background due to RPM single transaction requirements. This config is not necessary when using zypperoni as it passes `ZYPP_SINGLE_RPMTRANS=1` as an environment variable when calling zypper.

zypperoni

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,7 @@ async def main_task(num_jobs, task_type, task_items, no_confirm=None):
333333
release_zypp_lock()
334334
# perform additional zypper commands (if any) on no exception
335335
if not EXCEPTION_OCCUR:
336-
msg = "Zypperoni has finished its tasks. Handing you over to zypper..."
336+
msg = "Zypperoni has finished it's tasks. Handing you over to zypper..."
337337
if task_type == "dup":
338338
logging.info(msg)
339339
command = f"env ZYPP_SINGLE_RPMTRANS=1 zypper {'--non-interactive' if no_confirm else ''} --no-cd dist-upgrade"
@@ -428,12 +428,12 @@ if os.getuid() != 0:
428428
zypperoni_cleanup()
429429
sys.exit(3)
430430

431-
# Bail out if required dependecies are not available
431+
# Bail out if required dependencies are not available
432432
programs = ["zypper", "echo", "ps", "sed", "awk", "mkdir", "cat", "dirname", "basename", \
433433
"readlink", "mount", "chroot", "umount", "sleep", "rm", "env", "findmnt"]
434434
for program in programs:
435435
if not shell_exec(f"command -v {program}"):
436-
logging.error(f"Bailing out, missing required dependecy {program!r} in PATH ({os.environ.get('PATH')}) " \
436+
logging.error(f"Bailing out, missing required dependency {program!r} in PATH ({os.environ.get('PATH')}) " \
437437
f"for user {os.environ.get('USER')!r}. The following shell tools " \
438438
f"are required for zypperoni to function: {', '.join(programs)}"
439439
)
@@ -528,7 +528,7 @@ elif COMMAND in ["dup", "dup-download"]:
528528
# proceed straight to dup if all packages are in cache
529529
if COMMAND == "dup" and download_size_bytes == 0:
530530
zypperoni_cleanup()
531-
logging.info("Zypperoni has finished its tasks. Handing you over to zypper...")
531+
logging.info("Zypperoni has finished it's tasks. Handing you over to zypper...")
532532
command = f"env ZYPP_SINGLE_RPMTRANS=1 zypper {'--non-interactive' if NO_CONFIRM else ''} --no-cd dist-upgrade"
533533
os.system(command)
534534
sys.exit()
@@ -546,7 +546,7 @@ elif COMMAND in ["dup", "dup-download"]:
546546
# Handle commands: in, in-download
547547
elif COMMAND in ["in", "in-download"]:
548548
# get info about install packages
549-
logging.info("Getting packages and its dependecies to be downloaded for installation")
549+
logging.info("Getting packages and their dependencies to be downloaded for installation")
550550
xml_output = shell_exec(f"env -i zypper --non-interactive --no-cd --xmlout install --dry-run {' '.join(ARG)}")
551551
logging.debug(xml_output)
552552
get_zypp_lock()
@@ -596,7 +596,7 @@ elif COMMAND in ["in", "in-download"]:
596596
# proceed straight to install if all packages are in cache
597597
if COMMAND == "in" and download_size_bytes == 0:
598598
zypperoni_cleanup()
599-
logging.info("Zypperoni has finished its tasks. Handing you over to zypper...")
599+
logging.info("Zypperoni has finished it's tasks. Handing you over to zypper...")
600600
command = f"env ZYPP_SINGLE_RPMTRANS=1 zypper {'--non-interactive' if NO_CONFIRM else ''} --no-cd install {' '.join(ARG)}"
601601
os.system(command)
602602
sys.exit()
@@ -614,7 +614,7 @@ elif COMMAND in ["in", "in-download"]:
614614
# Handle commands: inr, inr-download
615615
elif COMMAND in ["inr", "inr-download"]:
616616
# get info about recommended install packages
617-
logging.info("Getting new packages and its dependecies to be downloaded for recommended installation")
617+
logging.info("Getting new packages and their dependencies to be downloaded for recommended installation")
618618
xml_output = shell_exec(f"env -i zypper --non-interactive --no-cd --xmlout install-new-recommends --dry-run")
619619
logging.debug(xml_output)
620620
get_zypp_lock()
@@ -655,7 +655,7 @@ elif COMMAND in ["inr", "inr-download"]:
655655
# proceed straight to inr if all packages are in cache
656656
if COMMAND == "inr" and download_size_bytes == 0:
657657
zypperoni_cleanup()
658-
logging.info("Zypperoni has finished its tasks. Handing you over to zypper...")
658+
logging.info("Zypperoni has finished it's tasks. Handing you over to zypper...")
659659
command = f"env ZYPP_SINGLE_RPMTRANS=1 zypper {'--non-interactive' if NO_CONFIRM else ''} --no-cd install-new-recommends"
660660
os.system(command)
661661
sys.exit()

0 commit comments

Comments
 (0)