Implement strict mode checkbox for sync runs.

see: SUSE/spacewalk#22420 This PR includes: 1. Added no-strict parameter handling in SyncRepositoriesAction.java, RepoSyncTask.java, and spacewalk-repo-sync. 2. Introduced a checkbox in syncrepos.jsp for user control, with accompanying text in StringResource_en_US.xml. 3. Adjusted RepoSync class in reposync.py to process the new parameter. Tested the functionality to ensure correct flag passing and expected behavior on toggling strict mode from the frontend.
uyuni-project · Oct 18, 2023 · 0aaf18a · 0aaf18a
1 parent 4da0ed2
commit 0aaf18a
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 8 deletions.
diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/SyncRepositoriesAction.java b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/SyncRepositoriesAction.java
@@ -133,7 +133,7 @@ public ActionForward execute(ActionMapping mapping,
 
             try {
                 Map<String, String> mparams = new HashMap<>();
-                String [] lparams = {"no-errata", "latest", "sync-kickstart", "fail"};
+                String [] lparams = {"no-errata", "latest", "sync-kickstart", "fail", "no-strict"};
 
                 for (String p : lparams) {
                     if  (request.getParameter(p) != null) {

diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
@@ -23549,6 +23549,12 @@ given channel.</source>
           <context context-type="sourcefile">/rhn/channels/manage/Sync.do</context>
         </context-group>
       </trans-unit>
+      <trans-unit id="channel.manage.sync.nostrict.jsp" xml:space="preserve">
+        <source>Do not use strict mode</source>
+        <context-group name="ctx">
+          <context context-type="sourcefile">/rhn/channels/manage/Sync.do</context>
+        </context-group>
+      </trans-unit>
       <trans-unit id="channel.manage.sync.latestonly.jsp" xml:space="preserve">
         <source>Sync only latest packages</source>
         <context-group name="ctx">

diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/RepoSyncTask.java b/java/code/src/com/redhat/rhn/taskomatic/task/RepoSyncTask.java
@@ -63,7 +63,7 @@ public void execute(JobExecutionContext context) throws JobExecutionException {
         final JobDataMap jobDataMap = context.getJobDetail().getJobDataMap();
         final List<Long> channelIds = getChannelIds(jobDataMap);
 
-        List<String> lparams = List.of("no-errata", "latest", "sync-kickstart", "fail");
+        List<String> lparams = List.of("no-errata", "latest", "sync-kickstart", "fail", "no-strict");
         List<String> ltrue = List.of("true", "1");
         List<String> params = new ArrayList<>();
         for (String p : lparams) {

diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/syncrepos.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/syncrepos.jsp
@@ -78,6 +78,13 @@
 
         </rl:list>
 
+        <div class="checkbox">
+            <label>
+                <input type="checkbox" name="no-strict" id="no-strict"/>
+                <bean:message key="channel.manage.sync.nostrict.jsp"/>
+            </label>
+        </div>
+
         <div class="checkbox">
             <label>
                 <input type="checkbox" name="no-errata" id="no-errata"/>
@@ -107,12 +114,10 @@
         </div>
 
         <br/>
-
         <c:if test='${scheduleEditable}'>
             <jsp:include page="/WEB-INF/pages/common/fragments/repeat-task-picker.jspf">
                 <jsp:param name="widget" value="date"/>
             </jsp:include>
-
             <div class="text-right">
                 <button type="submit" value="<bean:message key='schedule.button'/>" class="btn btn-default"
                         name="dispatch" ${inactive ? 'disabled' : ''}>
@@ -121,7 +126,7 @@
                 </button>
             </div>
         </c:if>
-
+    
         <c:if test='${not scheduleEditable}'>
             <div class="panel panel-default">
                 <div class="panel-heading">
@@ -134,7 +139,6 @@
             </div>
         </c:if>
 
-
     </rl:listset>
 
 </body>

diff --git a/java/spacewalk-java.changes.rrichardson.reposync_package_deletion b/java/spacewalk-java.changes.rrichardson.reposync_package_deletion
@@ -0,0 +1 @@
+- Add no-strict checkbox to manage channel sync page
diff --git a/python/spacewalk/satellite_tools/reposync.py b/python/spacewalk/satellite_tools/reposync.py
@@ -412,7 +412,7 @@ class RepoSync(object):
 
     def __init__(self, channel_label, repo_type=None, url=None, fail=False,
                  filters=None, no_errata=False, sync_kickstart=False, latest=False,
-                 metadata_only=False, strict=0, excluded_urls=None, no_packages=False,
+                 metadata_only=False, strict=False, excluded_urls=None, no_packages=False,
                  log_dir="reposync", log_level=None, force_kickstart=False, force_all_errata=False,
                  check_ssl_dates=True, force_null_org_content=False, show_packages_only=False,
                  noninteractive=False, deep_verify=False):

diff --git a/python/spacewalk/satellite_tools/spacewalk-repo-sync b/python/spacewalk/satellite_tools/spacewalk-repo-sync
@@ -105,6 +105,7 @@ def main():
                       callback=reposync.set_filter_opt,
                       type='str', nargs=1, dest='filters', default=[],
                       help="Comma or space separated list of excluded packages or package groups.")
+    parser.add_option('', '--no-strict', action='store_true',help="do not unlink packages when deleted from repository", dest='no_strict')
     parser.add_option('', '--email', action="store_true", help="e-mail a report of what was synced/imported")
     parser.add_option('', '--traceback-mail', action="store",
                       help="alternative email address(es) for sync output (--email option)")
@@ -143,7 +144,7 @@ def main():
     rhnLog.initLOG(log_path, log_level)
     log2disk(0, "Command: %s" % str(sys.argv))
 
-    l_params=["no_errata", "sync_kickstart", "fail"]
+    l_params=["no_errata", "sync_kickstart", "fail", "no-strict"]
     d_chan_repo=reposync.getChannelRepo()
     l_ch_custom=reposync.getCustomChannels()
     d_parent_child=reposync.getParentsChilds()
@@ -256,6 +257,7 @@ def main():
                       repo_type=options.repo_type,
                       url=repo,
                       fail=options.fail,
+                      strict= not options.no_strict,
                       noninteractive=options.noninteractive,
                       filters=options.filters,
                       deep_verify=options.deep_verify,

diff --git a/python/spacewalk/spacewalk-backend.changes.rrichardson.reposync_package_deletion b/python/spacewalk/spacewalk-backend.changes.rrichardson.reposync_package_deletion
@@ -0,0 +1,3 @@
+- Implement no-strict option:
+  * Make strict=false the default in reposync.py
+  * Add no-script parameter handling to spacewalk-repo-sync