File 1051-warn-when-trying-to-commit-a-prj-pac-manag... of Package osc

Overview Repositories Revisions Requests Users Attributes Meta

File 1051-warn-when-trying-to-commit-a-prj-pac-managed-in-scm.patch of Package osc (Revision 56670fc5b1ab193d8ee403098d0dde32)

Currently displaying revision 56670fc5b1ab193d8ee403098d0dde32 , Show latest

From 295ea7f3562ff93af586cebe1e04646f3ca6605c Mon Sep 17 00:00:00 2001
From: Daniel Mach <daniel.mach@suse.com>
Date: Tue, 7 Jun 2022 16:45:45 +0200
Subject: [PATCH] Warn when trying to commit a prj/pac managed in scm

---
 osc/commandline.py | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/osc/commandline.py b/osc/commandline.py
index 64e5a8f1..e876e2f2 100644
--- a/osc/commandline.py
+++ b/osc/commandline.py
@@ -5015,10 +5015,16 @@ def _commit(self, subcmd, opts, args):
         skip_local_service_run = False
         if not conf.config['local_service_run'] or opts.skip_local_service_run:
             skip_local_service_run = True
-        arg_list = args[:]
-        for arg in arg_list:
+
+        for arg in args.copy():
             if conf.config['do_package_tracking'] and is_project_dir(arg):
                 prj = Project(arg)
+
+                if prj.scm_url:
+                    print("WARNING: Skipping project '{}' because it is managed in scm (git): {}".format(prj.name, prj.scm_url))
+                    args.remove(arg)
+                    continue
+
                 if not msg and not opts.no_message:
                     msg = edit_message()
 
@@ -5037,6 +5043,12 @@ def _commit(self, subcmd, opts, args):
 
         pacs, no_pacs = findpacs(args, fatal=False)
 
+        for pac in pacs.copy():
+            if pac.scm_url:
+                print("WARNING: Skipping package '{}' because it is managed in scm (git): {}".format(pac.name, pac.scm_url))
+                pacs.remove(pac)
+                continue
+
         if conf.config['do_package_tracking'] and (pacs or no_pacs):
             prj_paths = {}
             single_paths = []

Places

File 1051-warn-when-trying-to-commit-a-prj-pac-managed-in-scm.patch of Package osc (Revision 56670fc5b1ab193d8ee403098d0dde32)

Places