diff --git a/CHANGELOG.md b/CHANGELOG.md index 15816e3..cae1007 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [1.6.1] - 2025-09-25 + +### Fixed + +- Fix three bugs + ## [1.6.0] - 2025-09-23 ### Added diff --git a/ogclient/interfaceAdm/Configurar b/ogclient/interfaceAdm/Configurar index dc93c6f..cf03e15 100755 --- a/ogclient/interfaceAdm/Configurar +++ b/ogclient/interfaceAdm/Configurar @@ -156,7 +156,8 @@ else: sys.exit (1) ## si no nos definen partición de cache y el disco tiene una, hay que borrarla -if not cache_seen: +## pero solo cuando check_sizes es falso! si check_sizes es true no hay que tocar nada +if not cache_seen and not check_sizes: c = CacheLib.ogFindCache() if c: cache_disk, cache_part = c.split() @@ -187,6 +188,7 @@ if not recreate_partition_table and not CacheLib.ogCheckNewCacheSize (dis, tch): ## size check: check that the newly defined partitions fit in the disk disk_sectors = DiskLib.ogGetLastSector (dis) +if disk_sectors is None: disk_sectors = 1e15 ## if None, then the disk is empty--for the purposes of size checks, treat it as if it were arbitrarily large IOSIZE = DiskLib.ogGetIoSize (dis) if not IOSIZE: SystemLib.ogRaiseError (['session', 'log'], ogGlobals.OG_ERR_FORMAT, f'Failed to get disk sector size') diff --git a/ogclient/lib/python3/GitLib/__init__.py b/ogclient/lib/python3/GitLib/__init__.py index 49a2e10..06990ab 100755 --- a/ogclient/lib/python3/GitLib/__init__.py +++ b/ogclient/lib/python3/GitLib/__init__.py @@ -102,7 +102,7 @@ class OgProgressPrinterWeb(git.RemoteProgress): now = time.time() if now - self.last_ts < 1: return - stage_portion = (100 / self.total_stages) + stage_portion = (1 / self.total_stages) if max_count: self.simple_progress = stage_portion * self._get_stage_number(op_code) + (stage_portion * cur_count/max_count)