From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id A23211381F3 for ; Sat, 22 Jun 2013 15:14:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1BE94E0A53; Sat, 22 Jun 2013 15:14:31 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 839CEE0A62 for ; Sat, 22 Jun 2013 15:14:30 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 627EE33E680 for ; Sat, 22 Jun 2013 15:14:29 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id E32B5E5466 for ; Sat, 22 Jun 2013 15:14:26 +0000 (UTC) From: "André Erdmann" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "André Erdmann" Message-ID: <1371897084.305933fc8ce3375745927cfda5fca824eb67f004.dywi@gentoo> Subject: [gentoo-commits] proj/R_overlay:gsoc13/next commit in: roverlay/ X-VCS-Repository: proj/R_overlay X-VCS-Files: roverlay/packageinfo.py X-VCS-Directories: roverlay/ X-VCS-Committer: dywi X-VCS-Committer-Name: André Erdmann X-VCS-Revision: 305933fc8ce3375745927cfda5fca824eb67f004 X-VCS-Branch: gsoc13/next Date: Sat, 22 Jun 2013 15:14:26 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: c2769045-42c7-4695-9a13-74c5b9211222 X-Archives-Hash: 604fb9bf4491aa8d02a8983faad4a831 Message-ID: <20130622151426.4ScADC0c3hA7beX7kgSYFEQk9hMWTNDYSE2qujmuWoQ@z> commit: 305933fc8ce3375745927cfda5fca824eb67f004 Author: André Erdmann mailerd de> AuthorDate: Sat Jun 22 10:31:24 2013 +0000 Commit: André Erdmann mailerd de> CommitDate: Sat Jun 22 10:31:24 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=305933fc roverlay/packageinfo: support revbumps --- roverlay/packageinfo.py | 91 ++++++++++++++++++++++++++++++------------------- 1 file changed, 56 insertions(+), 35 deletions(-) diff --git a/roverlay/packageinfo.py b/roverlay/packageinfo.py index 83a05ed..b75eb8c 100644 --- a/roverlay/packageinfo.py +++ b/roverlay/packageinfo.py @@ -16,6 +16,8 @@ __all__ = [ 'PackageInfo', ] import re import os.path import logging +# TODO: remove threading/locks here, exclusive access to PackageInfo instances +# should be guaranteed import threading import roverlay.digest @@ -320,10 +322,6 @@ class PackageInfo ( object ): return self._info [key_low] # 'virtual' keys - calculate result - elif key_low == 'name': - # no special name, using package_name - return self._info ['package_name'] - elif key_low == 'package_file': distdir = self.get ( 'distdir', do_fallback=True ) if distdir: @@ -443,14 +441,14 @@ class PackageInfo ( object ): """Returns the DESCRIPTION data for this PackageInfo (by reading the R package file if necessary). """ - if 'desc_data' in self._info: - return self._info ['desc_data'] - - self._writelock_acquire() if 'desc_data' not in self._info: - self._info ['desc_data'] = descriptionreader.read ( self ) + self._writelock_acquire() + if 'desc_data' not in self._info: + self._info ['desc_data'] = descriptionreader.read ( self ) + + self._update_lock.release() + # -- end if; - self._update_lock.release() return self._info ['desc_data'] # --- end of get_desc_data (...) --- @@ -518,12 +516,14 @@ class PackageInfo ( object ): arguments: * newrev -- new revision, (current rev + 1) is used if this is None """ - raise NotImplementedError ( "revbump code" ) if newrev is None: # get old rev and increment it - pass + ## direct dict access + self._info ['rev'] += 1 else: - pass + self._info ['rev'] = int ( newrev ) + + self._reset_version_str() return self # --- end of revbump (...) --- @@ -635,6 +635,19 @@ class PackageInfo ( object ): return None # --- end of get_evars (...) --- + def _reset_version_str ( self ): + rev = self ['rev'] + version = self ['version'] + + if rev > 0: + vstr = '.'.join ( str ( k ) for k in version ) + '-r' + str ( rev ) + else: + vstr = '.'.join ( str ( k ) for k in version ) + + self._info ['ebuild_verstr'] = vstr + #return vstr + # --- end of _reset_version_str (...) --- + def _update ( self, info ): """Updates self._info using the given info dict. @@ -645,15 +658,14 @@ class PackageInfo ( object ): for key, value in info.items(): - if key in self.__class__._UPDATE_KEYS_SIMPLE: - self [key] = value - - elif initial and key in self.__class__._UPDATE_KEYS_SIMPLE_INITIAL: - self [key] = value + if key in self.__class__._UPDATE_KEYS_SIMPLE or ( + initial and key in self.__class__._UPDATE_KEYS_SIMPLE_INITIAL + ): + self._info [key] = value elif key in self.__class__._UPDATE_KEYS_FILTER_NONE: if value is not None: - self [key] = value + self._info [key] = value elif key == 'filename': self._use_filename ( value ) @@ -662,10 +674,10 @@ class PackageInfo ( object ): self._use_pvr ( value ) elif key == 'suggests': - self ['has_suggests'] = value + self._info ['has_suggests'] = value elif key == 'depres_result': - self ['has_suggests'] = value [2] + self._info ['has_suggests'] = value [2] elif key == 'filepath': self._use_filepath ( value ) @@ -720,7 +732,7 @@ class PackageInfo ( object ): try: version = tuple ( int ( z ) for z in version_str.split ( '.' ) ) - self ['version'] = version + self._info ['version'] = version except ValueError as ve: # version string is malformed, cannot use it self.logger.error ( @@ -736,24 +748,33 @@ class PackageInfo ( object ): # removing illegal chars from the package_name ebuild_name = strutil.fix_ebuild_name ( package_name ) - if ebuild_name != package_name: - self ['name'] = ebuild_name - - self ['ebuild_verstr'] = version_str - # for DescriptionReader - self ['package_name'] = package_name + self._info ['package_name'] = package_name - self ['package_filename'] = filename_with_ext + self._info ['rev'] = 0 + self._info ['name'] = ebuild_name + self._info ['ebuild_verstr'] = version_str + self._info ['package_filename'] = filename_with_ext # --- end of _use_filename (...) --- def _use_pvr ( self, pvr ): - # 0.1_pre2-r17 -> ( 0, 1 ) - pv = pvr.partition ( '-' ) [0] - self ['version'] = tuple ( - int ( z ) for z in ( pv.partition ( '_' ) [0].split ( '.' ) ) - ) - self ['ebuild_verstr'] = pvr + # 0.1_pre2-r17 -> ( ( 0, 1 ), ( 17 ) ) + pv_str, DONT_CARE, pr_str = pvr.partition ( '-r' ) + pv, DONT_CARE, pv_suffix = pv_str.partition ( '_' ) + + if pv_suffix: + # not supported + raise NotImplementedError ( + "version suffix {!r} cannot be preserved for $PVR {!r}".format ( + pv_suffix, pvr + ) + ) + # non-digit chars in pv are unsupported, too + + self._info ['version'] = tuple ( int ( z ) for z in pv.split ( '.' ) ) + self._info ['rev'] = int ( pr_str ) if pr_str else 0 + + self._info ['ebuild_verstr'] = pvr # --- end of _use_pvr (...) --- def _remove_auto ( self, ebuild_status ):