Attachment 238731 Details for Bug 353731 – Path to get satellite-sync working again.

[patch] Path to get satellite-sync working again.

satellite-sync.diff (text/plain), 3.34 KB, created by Jan Pazdziora on 2007-10-26 09:45:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Pazdziora

Created: 2007-10-26 09:45:29 UTC

Size: 3.34 KB

patch

obsolete

>--- ./server/importlib/backend.py.orig	2007-10-26 10:51:25.000000000 +0200
>+++ ./server/importlib/backend.py	2007-10-26 11:09:34.000000000 +0200
>@@ -1399,6 +1399,8 @@
>                     tbl = self.tables[tname]
>                     # Get the list of objects for this package
>                     entry_list = object[tbl.getAttribute()]
>+                    if entry_list is None:
>+                        continue
>                     for entry in entry_list:
>                         extObject = {childTables[tname] : id}
>                         seq_col = tbl.sequenceColumn
>@@ -1504,6 +1506,8 @@
>             fields = childTableObj.getFields()
>             pks = childTableObj.getPK()
>             childSeverityHash = childTableObj.getSeverityHash()
>+            if entrylist is None:
>+                continue
>             for ent in entrylist:
>                 # Build the primary key
>                 key = []
>--- ./server/importlib/channelImport.py.orig	2007-10-26 10:43:08.000000000 +0200
>+++ ./server/importlib/channelImport.py	2007-10-26 11:03:18.000000000 +0200
>@@ -33,8 +33,11 @@
>         for dist in channel['dists']:
>             self.arches[dist['channel_arch']] = None
>         # Product Names
>-        for release in channel['release']:
>-            self.arches[release['channel_arch']] = None
>+        if channel.has_key('release') and channel['release'] is not None:
>+            for release in channel['release']:
>+                self.arches[release['channel_arch']] = None
>+        if not channel.has_key('receiving_updates') or channel['receiving_updates'] is None:
>+           channel['receiving_updates'] = 'N'
>         
>     def fix(self):
>         self.backend.lookupChannelArches(self.arches)
>@@ -75,13 +78,14 @@
>                 raise InvalidArchError(arch, "Unsupported channel arch %s" % arch)
>             dist['channel_arch_id'] = self.arches[arch]
>         #release
>-        for release in channel['release']:
>-            arch = release['channel_arch']
>-            if self.arches[arch] is None:
>-                # Mark it as ignored
>-                channel.ignored = 1
>-                raise InvalidArchError(arch, "Unsupported channel arch %s" % arch)
>-            release['channel_arch_id'] = self.arches[arch]
>+        if channel.has_key('release') and channel['release'] is not None:
>+            for release in channel['release']:
>+                arch = release['channel_arch']
>+                if self.arches[arch] is None:
>+                    # Mark it as ignored
>+                    channel.ignored = 1
>+                    raise InvalidArchError(arch, "Unsupported channel arch %s" % arch)
>+                release['channel_arch_id'] = self.arches[arch]
> 
>     def submit(self):
>         parentChannels = {}
>--- ./satellite_tools/satsync.py.orig	2007-10-26 11:06:37.000000000 +0200
>+++ ./satellite_tools/satsync.py	2007-10-26 11:10:18.000000000 +0200
>@@ -725,8 +725,11 @@
>     def processBlacklists(self):
>         self._process_simple("getBlacklistsXmlStream",
>           xmlDiskSource.BlacklistsDiskSource, "blacklists")
>-	self._process_simple("getProductNamesXmlStream",
>+        try:
>+            self._process_simple("getProductNamesXmlStream",
> 	            xmlDiskSource.ProductnamesDiskSource, "product names")
>+        except Exception:
>+            None
> 
>     def _compute_unique_packages(self):
>         ### process package metadata for one channel at a time

Actions: View | Diff

Attachments on bug 353731: 238731