diff options
| author |   André Erdmann <dywi@mailerd.de> | 2012-07-18 18:46:49 +0200 |
|---|---|---|
| committer | André Erdmann <dywi@mailerd.de> | 2012-07-18 18:46:49 +0200 |
| commit | bd0d4d01b9b32f82040f0782fab40b957f70eb94 (patch) | |
| tree | 55344e40d385bb3cedf0e51721ae6019b211c831 /roverlay/packageinfo.py | |
| parent | util, dodir: catch OSError if dir exists (diff) | |
| download | R_overlay-bd0d4d01b9b32f82040f0782fab40b957f70eb94.tar.gz R_overlay-bd0d4d01b9b32f82040f0782fab40b957f70eb94.tar.bz2 R_overlay-bd0d4d01b9b32f82040f0782fab40b957f70eb94.zip | |
incremental overlay writing (at runtime)
Packages can now be written directly after adding them to the overlay.
Also removed unused code / code duplicates, e.g. show() and write() in
package.py.
geändert: roverlay/overlay/category.py
geändert: roverlay/overlay/creator.py
geändert: roverlay/overlay/package.py
geändert: roverlay/overlay/root.py
geändert: roverlay/packageinfo.py
Diffstat (limited to 'roverlay/packageinfo.py')
| -rw-r--r-- | roverlay/packageinfo.py | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/roverlay/packageinfo.py b/roverlay/packageinfo.py index 96cdb37..a2910c5 100644 --- a/roverlay/packageinfo.py +++ b/roverlay/packageinfo.py @@ -157,8 +157,8 @@ class PackageInfo ( object ): # 'has_suggests' not in self._info -> assume False return False - elif key_low == 'physical': - # 'physical' not in self._info -> assume False + elif key_low == 'physical_only': + # 'physical_only' not in self._info -> assume False return False elif key_low == 'src_uri': @@ -240,8 +240,11 @@ class PackageInfo ( object ): elif key == 'ebuild': self ['ebuild'] = value - elif key == 'physical': - self ['physical'] = value + elif key == 'ebuild_file': + self ['ebuild_file'] = value + + elif key == 'physical_only': + self ['physical_only'] = value elif key == 'pvr': self._use_pvr ( value ) @@ -266,7 +269,7 @@ class PackageInfo ( object ): self._remove_auto ( value ) else: - LOGGER.error ( "unknown info key %s!" % key ) + LOGGER.error ( "unknown info key {}!".format ( key ) ) self._update_lock.release() # --- end of update (**kw) --- @@ -288,8 +291,8 @@ class PackageInfo ( object ): if not sepa: # file name unexpected, tarball extraction will (probably) fail - LOGGER.error ( "unexpected file name '%s'." % filename ) - raise Exception ( "cannot use file '%s'." % filename ) + LOGGER.error ( "unexpected file name {!r}.".format ( filename ) ) + raise Exception ( "cannot use file {!r}.".format ( filename ) ) return version_str = PackageInfo.EBUILDVER_REGEX.sub ( '.', package_version ) @@ -338,7 +341,7 @@ class PackageInfo ( object ): after entering status 'ebuild_status' (like ebuild in overlay and written -> don't need the ebuild string etc.) """ - raise Exception ( "method stub" ) + print ( "PackageInfo._remove_auto: method stub, request ignored." ) # --- end of _remove_auto (...) --- def _use_filepath ( self, _filepath ): @@ -356,7 +359,8 @@ class PackageInfo ( object ): # --- end of _use_filepath (...) --- def __str__ ( self ): - return "<PackageInfo for %s>" % self.get ( - 'package_file', fallback_value='[unknown file]', do_fallback=True - ) + return "<PackageInfo for {pkg}>".format ( + pkg=self.get ( + 'package_file', fallback_value='[unknown file]', do_fallback=True + ) ) # --- end of __str__ (...) --- |