From 0a077f6db628171a7feb49b6fc2573fd0c2adfb9 Mon Sep 17 00:00:00 2001 From: Vadim Troshchinskiy Date: Thu, 14 Aug 2025 16:09:08 +0200 Subject: [PATCH] refs #2506 argument fixes --- ogclient/interfaceAdm/CrearImagenGit.py | 6 ++++-- ogclient/interfaceAdm/ModificarImagenGit.py | 1 + ogclient/interfaceAdm/RestaurarImagenGit.py | 4 +++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ogclient/interfaceAdm/CrearImagenGit.py b/ogclient/interfaceAdm/CrearImagenGit.py index 4de43bd..3ff4e52 100755 --- a/ogclient/interfaceAdm/CrearImagenGit.py +++ b/ogclient/interfaceAdm/CrearImagenGit.py @@ -2,6 +2,7 @@ import sys import resource import logging +import argparse import NetLib @@ -62,7 +63,7 @@ def main(): print(f"No se pudo aumentar el límite de archivos abiertos: {e}") - parser = argparse.ArgumentParser( + parser = argparse.ArgumentParser( prog = "OpenGnsys Git Image Create", description = "Creates a git repository from a partition" ) @@ -70,6 +71,7 @@ def main(): parser.add_argument("--disk", type=int, metavar="DISK", required=True, help="Disk ID") parser.add_argument("--partition", type=int, metavar="PART", required=True, help="Disk partition") parser.add_argument("--repository", type=str, metavar="REPO", required=True, help="Address of the Git repository to clone") + parser.add_argument("--image-name", type=str, metavar="REPO", required=True, help="Name of the new image at the repository") parser.add_argument("--tag", type=str, metavar="TAG", required=False, help="Tag to automatically create") parser.add_argument("--message", type=str, metavar="MSG", required=False, help="Commit message") @@ -104,7 +106,7 @@ def main(): # repo = repositorio, oggit@server.com:/oggit # image = nombre repo - retval = create_image(args.disk, args.partition, repo, image_name, args.tag) + retval = create_image(args.disk, args.partition, args.repository, args.image_name, args.tag) diff --git a/ogclient/interfaceAdm/ModificarImagenGit.py b/ogclient/interfaceAdm/ModificarImagenGit.py index c54d1e9..b59ab3b 100755 --- a/ogclient/interfaceAdm/ModificarImagenGit.py +++ b/ogclient/interfaceAdm/ModificarImagenGit.py @@ -104,6 +104,7 @@ def main(): parser.add_argument("--disk", type=int, metavar="DISK", required=True, help="Disk ID") parser.add_argument("--partition", type=int, metavar="PART", required=True, help="Disk partition") parser.add_argument("--repository", type=str, metavar="REPO", required=True, help="Address of the Git repository to clone") + parser.add_argument("--branch", type=str, metavar="BRANCH", required=False, help="Branch to automatically create") parser.add_argument("--options", type=str, metavar="OPTS", required=False, help="Options to branch creation (forcepush)") parser.add_argument("--message", type=str, metavar="MSG", required=False, help="Commit message") diff --git a/ogclient/interfaceAdm/RestaurarImagenGit.py b/ogclient/interfaceAdm/RestaurarImagenGit.py index 1feb29b..8896703 100755 --- a/ogclient/interfaceAdm/RestaurarImagenGit.py +++ b/ogclient/interfaceAdm/RestaurarImagenGit.py @@ -55,6 +55,8 @@ if __name__ == "__main__": parser.add_argument("--disk", type=int, metavar="DISK", required=True, help="Disk ID") parser.add_argument("--partition", type=int, metavar="PART", required=True, help="Disk partition") parser.add_argument("--repository", type=str, metavar="REPO", required=True, help="Address of the Git repository to clone") + parser.add_argument("--image-name", type=str, metavar="REPO", required=True, help="Name of the new image at the repository") + parser.add_argument("--branch", type=str, metavar="BRANCH", required=True, help="Branch to check out") parser.add_argument("--commit", type=str, metavar="COMMIT_ID", required=True, help="Commit to check out") parser.add_help = True @@ -90,7 +92,7 @@ if __name__ == "__main__": device = DiskLib.ogDiskToDev(args.disk, args.partition) - og_git.cloneRepo(args.repo, destination = device, boot_device = device, ref = args.commit, branch = args.branch) + og_git.cloneRepo(args.image_name, destination = device, boot_device = device, ref = args.commit, branch = args.branch) logger.info("RestaurarImagenGit Finished.")