Skip to content

Commit d0b3a0d

Browse files
author
ttwoxa
committed
Revert some changes
1 parent e290fb6 commit d0b3a0d

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
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 it's working directory in `/tmp/zypperoni_*`, so a reboot would always cleanup.
66+
Zypperoni keeps its 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 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.
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.

zypperoni

100644100755
Lines changed: 4 additions & 4 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 it's tasks. Handing you over to zypper..."
336+
msg = "Zypperoni has finished its 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"
@@ -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 it's tasks. Handing you over to zypper...")
531+
logging.info("Zypperoni has finished its 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()
@@ -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 it's tasks. Handing you over to zypper...")
599+
logging.info("Zypperoni has finished its 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()
@@ -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 it's tasks. Handing you over to zypper...")
658+
logging.info("Zypperoni has finished its 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)