Attachment 1301909 Details for Bug 1198723 – apt-transport-spacewalk patch for signed repos

[patch] apt-transport-spacewalk patch for signed repos

apt-spacewalk.diff (text/plain), 2.27 KB, created by ppanon-avi on 2017-07-20 17:19:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: ppanon-avi

Created: 2017-07-20 17:19:14 UTC

Size: 2.27 KB

patch

obsolete

>--- a/pre_invoke.py	2017-06-21 14:07:04.580000000 -0700
>+++ b/pre_invoke.py	2017-06-21 14:25:34.384000000 -0700
>@@ -37,10 +37,9 @@
> def get_channels():
>     """Return channels associated with a machine"""
>     try:
>-        channels = ['main']
>+        channels = []
>         for channel in rhnChannel.getChannelDetails():
>-            if channel['parent_channel']:
>-                channels.append(channel['label'])
>+            channels.append(channel['label'])
>         return channels
>     except up2dateErrors.Error:
>         return []
>@@ -66,15 +65,17 @@
>             source.set_enabled(False)
>             sw_source.append(source)
> 
>+    for source in sw_source:
>+        sources.remove(source)
>+
>     if up2dateAuth.getSystemId():
>         channels = get_channels()
>         if len(channels):
>-            for source in sw_source:
>-                sources.remove(source)
>-            sources.add(type='deb',
>+            for chan in channels:
>+                sources.add(type='deb',
>                         uri='spacewalk://' + get_server(),
>-                        dist='channels:',
>-                        orig_comps=channels,
>+                        dist=chan,
>+                        orig_comps=['repodata'],
>                         file=get_conf_file()
>                         )
>     sources.save()
>+++ a/spacewalk	2017-06-27 19:04:29.216000000 -0700
>--- b/spacewalk	2017-06-21 14:37:50.444000000 -0700
>@@ -191,10 +191,11 @@
> 
>     def __transform_document(self, document):
>         """Transform url given by apt to real spacewalk url"""
>-        document = document.replace('dists/channels:/main/',
>-                'dists/channels:/' + self.base_channel  + '/', 1)
>-        document = re.sub('/binary-[\d\w]*/', '/repodata/', document, 1)
>-        document = document.replace('dists/channels:/', '/XMLRPC/GET-REQ/', 1)
>+        document = document.replace('dists/', '/XMLRPC/GET-REQ/', 1)
>+        document = re.sub('/binary-[\d\w]*/', '/', document, 1)
>+        document = re.sub('/(InRelease|Release|Release.gpg|Release.gz)',r'/repodata/\1', document, 1)
>+        # point i18n to wrong path so we dont get traceback mails when not having i18n in repodata
>+        document = document.replace('repodata/i18n', '/i18n', 1)
>         return document

Actions: View | Diff

Attachments on bug 1198723: 999611 | 999612 | 999613 | 999617 | 1301897 | 1301909 | 1301915