euscan: misc fixes
Signed-off-by: Corentin Chary <corentin.chary@gmail.com>
This commit is contained in:
		@@ -53,6 +53,14 @@ def emerge_sync(logger):
 | 
			
		||||
           "--config-root", settings.PORTAGE_CONFIGROOT]
 | 
			
		||||
    return _launch_command(cmd, logger)
 | 
			
		||||
 | 
			
		||||
def emerge_metadata(logger):
 | 
			
		||||
    """
 | 
			
		||||
    Launches an emerge --metadata
 | 
			
		||||
    """
 | 
			
		||||
    cmd = ["emerge", "--metadata", "--root", settings.PORTAGE_ROOT,
 | 
			
		||||
           "--config-root", settings.PORTAGE_CONFIGROOT]
 | 
			
		||||
    return _launch_command(cmd, logger)
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
def layman_sync(logger, cache=True):
 | 
			
		||||
    """
 | 
			
		||||
@@ -106,7 +114,8 @@ def update_portage_trees(logger=None):
 | 
			
		||||
    logger.info("Running layman --sync")
 | 
			
		||||
    layman_sync(logger, cache=True)
 | 
			
		||||
    #logger.info("Running emerge --regen")
 | 
			
		||||
    #emerge_regen()
 | 
			
		||||
    #emerge_regen(logger)
 | 
			
		||||
    emerge_metadata(logger)
 | 
			
		||||
    logger.info("Running eix-update")
 | 
			
		||||
    eix_update(logger)
 | 
			
		||||
    logger.info("Done!")
 | 
			
		||||
 
 | 
			
		||||
@@ -91,8 +91,10 @@ class ScanMetadata(object):
 | 
			
		||||
        try:
 | 
			
		||||
            metadata = None
 | 
			
		||||
            pkg, metadata = self.metadata_from_db(query, pkg)
 | 
			
		||||
 | 
			
		||||
            if not metadata:
 | 
			
		||||
                pkg, metadata = self.metadata_from_portage(query, pkg)
 | 
			
		||||
 | 
			
		||||
            if not metadata:
 | 
			
		||||
                return
 | 
			
		||||
        except Exception as e:
 | 
			
		||||
@@ -148,6 +150,7 @@ class ScanMetadata(object):
 | 
			
		||||
                    self.style.ERROR("Bad maintainer: '%s' '%s'" % \
 | 
			
		||||
                                         (maintainer.name, maintainer.email))
 | 
			
		||||
                )
 | 
			
		||||
 | 
			
		||||
        pkg.save()
 | 
			
		||||
 | 
			
		||||
    def store_herd(self, name, email):
 | 
			
		||||
 
 | 
			
		||||
@@ -223,7 +223,7 @@ def update_upstream():
 | 
			
		||||
def scan_package(package):
 | 
			
		||||
    scan_portage([package], purge_packages=True, purge_versions=True)
 | 
			
		||||
    scan_metadata([package])
 | 
			
		||||
    scan_upstream([package])
 | 
			
		||||
    scan_upstream([package], purge_versions=True)
 | 
			
		||||
    return True
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@@ -254,7 +254,7 @@ def consume_refresh_queue(locked=False):
 | 
			
		||||
        pkg = query.package
 | 
			
		||||
        query.delete()
 | 
			
		||||
        scan_package_user.delay(pkg)
 | 
			
		||||
        logger.info('Done (%s)' % pkg)
 | 
			
		||||
        logger.info('Selected: %s' % pkg)
 | 
			
		||||
    except IndexError:
 | 
			
		||||
        pass
 | 
			
		||||
    finally:
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user