From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1SjDtl-0001YY-Uq for garchives@archives.gentoo.org; Mon, 25 Jun 2012 18:20:30 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F3D16E0B08; Mon, 25 Jun 2012 18:19:52 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id B39EFE0AE3 for ; Mon, 25 Jun 2012 18:19:52 +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 EA8FF1B445F for ; Mon, 25 Jun 2012 18:19:51 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id BAC85E543F for ; Mon, 25 Jun 2012 18:19:49 +0000 (UTC) From: "André Erdmann" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "André Erdmann" Message-ID: <1340647927.edd8719acc718698e597ff4cebe52aa520237d17.dywi@gentoo> Subject: [gentoo-commits] proj/R_overlay:master 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: edd8719acc718698e597ff4cebe52aa520237d17 X-VCS-Branch: master Date: Mon, 25 Jun 2012 18:19:49 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 187f8c85-d6c5-4f62-b9ec-27e97460e1cc X-Archives-Hash: 29ab843acd00ad02d042049998a01bc0 commit: edd8719acc718698e597ff4cebe52aa520237d17 Author: Andr=C3=A9 Erdmann mailerd de> AuthorDate: Mon Jun 25 18:12:07 2012 +0000 Commit: Andr=C3=A9 Erdmann mailerd de> CommitDate: Mon Jun 25 18:12:07 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/R_overlay.git= ;a=3Dcommit;h=3Dedd8719a extend PackageInfo --- roverlay/packageinfo.py | 80 +++++++++++++++++++++++++++++++----------= ----- 1 files changed, 54 insertions(+), 26 deletions(-) diff --git a/roverlay/packageinfo.py b/roverlay/packageinfo.py index 712b5a6..fdce322 100644 --- a/roverlay/packageinfo.py +++ b/roverlay/packageinfo.py @@ -136,19 +136,22 @@ class PackageInfo ( object ): return self._info [key_low] =20 # 'virtual' keys - calculate result - elif key_low =3D=3D 'distdir': - if 'package_dir' in self._info: - return self._info ['package_dir'] - - elif 'package_file' in self._info: - return os.path.dirname ( self._info ['package_file'] ) + elif key_low =3D=3D 'name': + # no special name, using package_name + return self._info ['package_name'] + + elif key_low =3D=3D 'package_file': + # assuming that origin is in self._info + return os.path.join ( + self._info ['origin'].distdir, + self._info ['package_filename'] + ) =20 - #elif 'origin' in self._info: + elif key_low =3D=3D 'distdir': + if 'origin' in self._info: + return self._info ['origin'].distdir else: - return os.path.join ( - config.get_or_fail ( ['DISTFILES', 'root' ] ), - self._info ['origin'] - ) + return os.path.dirname ( self._info ['package_file'] ) =20 elif key_low =3D=3D 'has_suggests': if 'has_suggests' in self._info: @@ -164,9 +167,17 @@ class PackageInfo ( object ): # comment from ebuild: ## calculate SRC_URI using self._data ['origin'], ## either here or in eclass - return "http://TODO!!!/" + self._info ['package_filename'] + #return "**packageinfo needs information from sync module!" =20 + if 'origin' in self._info: + return self._info ['origin'].get_src_uri ( + self._info ['package_filename'] + ) + else: + return "http://localhost/R-packages/" + \ + self._info ['package_filename'] + =20 # fallback if do_fallback: @@ -228,6 +239,9 @@ class PackageInfo ( object ): elif key =3D=3D 'filepath': self._use_filepath ( value ) =20 + elif key =3D=3D 'filename': + self._use_filename ( value ) + elif key =3D=3D 'origin': self ['origin'] =3D value =20 @@ -243,16 +257,13 @@ class PackageInfo ( object ): self._update_lock.release() # --- end of update (**kw) --- =20 - def _use_filepath ( self, _filepath ): + def _use_filename ( self, _filename ): """auxiliary method for update(**kw) =20 arguments: - * _filepath -- + * _filename -- """ - - filepath =3D os.path.abspath ( _filepath ) - - filename_with_ext =3D os.path.basename ( filepath ) + filename_with_ext =3D _filename =20 # remove .tar.gz .tar.bz2 etc. filename =3D PackageInfo.PKGSUFFIX_REGEX.sub ( '', filename_with_ext ) @@ -281,25 +292,42 @@ class PackageInfo ( object ): ) raise =20 - - # using package name as name (unless modified later), # using pkg_version for the ebuild version self ['name'] =3D package_name self ['ebuild_verstr'] =3D version_str =20 - # for DescriptionReader - self ['package_file'] =3D filepath self ['package_name'] =3D package_name =20 self ['package_filename'] =3D filename_with_ext + # --- end of _use_filename (...) --- =20 - # keys never used (FIXME remove or use) - #self ['filename'] =3D filename - #self ['filepath'] =3D filepath - #self ['package_version'] =3D package_version + def _use_filepath ( self, _filepath ): + """auxiliary method for update(**kw) + + arguments: + * _filepath -- + """ + LOGGER.info ( + 'Please note that _use_filepath is only meant for testing.' + ) + filepath =3D os.path.abspath ( _filepath ) + self ['package_file'] =3D filepath + self._use_filename ( os.path.basename ( filepath ) ) # --- end of _use_filepath (...) --- =20 def _use_depres_result ( self, result ): + """auxiliary method for update(**kw) + + arguments: + * result -- + """ self ['has_suggests'] =3D result [2] + # --- end of _use_depres_result (...) --- + + def __str__ ( self ): + return "" % self.get ( + 'package_file', fallback_value=3D'[unknown file]', do_fallback=3DTrue + ) + # --- end of __str__ (...) ---