Hello community, here is the log from the commit of package smart checked in at Thu Sep 6 22:26:34 CEST 2007. -------- --- smart/smart.changes 2007-08-29 20:31:13.000000000 +0200 +++ /mounts/work_src_done/STABLE/smart/smart.changes 2007-09-06 14:31:46.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Sep 6 14:29:28 CEST 2007 - cthiel@suse.de + +- support compressed packages.gz in yast2 channels (#308080) + +------------------------------------------------------------------- New: ---- smart-0.51-yast2_compressed-packages.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ smart.spec ++++++ --- /var/tmp/diff_new_pack.l29158/_old 2007-09-06 22:23:47.000000000 +0200 +++ /var/tmp/diff_new_pack.l29158/_new 2007-09-06 22:23:47.000000000 +0200 @@ -20,7 +20,7 @@ %endif Summary: Smart Package Manager Version: 0.51 -Release: 41 +Release: 45 Source: %{name}-%{version}.tar.bz2 Source1: distro.py Source2: %{name}.desktop @@ -33,6 +33,7 @@ Patch4: %{name}-ksmarttray.patch Patch5: %{name}-yast-media.patch Patch6: %{name}-show-changelog.patch +Patch7: %{name}-0.51-yast2_compressed-packages.patch Patch100: %{name}-fix-archscore-add-disable-biarch-option.patch Patch101: %{name}-better-x86_64-support.patch Patch102: %{name}-broken-repo-without-summary-or-description-workaround.diff @@ -101,6 +102,7 @@ %patch4 %patch5 %patch6 +%patch7 %if %{suse_version} < 1010 echo ' sysconf.set("no-rpm-readHeaderFromFD", 3)' >> %{SOURCE1} %endif @@ -216,6 +218,8 @@ /opt/kde3/share/apps/konqueror %changelog +* Thu Sep 06 2007 - cthiel@suse.de +- support compressed packages.gz in yast2 channels (#308080) * Wed Aug 29 2007 - cthiel@suse.de - updated smart-fix-archscore-add-disable-biarch-option.patch and smart-better-x86_64-support.patch to include improvements by Maciej ++++++ smart-0.51-yast2_compressed-packages.patch ++++++ --- smart/channels/yast2.py +++ smart/channels/yast2.py @@ -40,9 +40,9 @@ def getFetchSteps(self): return 4 - def __fetchFile(self, file, fetcher, progress): + def __fetchFile(self, file, fetcher, progress, uncompress=False): fetcher.reset() - item = fetcher.enqueue(file) + item = fetcher.enqueue(file,uncomp=uncompress) fetcher.run(progress=progress) failed = item.getFailedReason() if failed: @@ -77,21 +77,25 @@ self.removeLoaders() descrdir = "suse/setup/descr" datadir = "RPMS" + uncompress = False for line in open(fetched.getTargetPath()): if line.startswith("DESCRDIR"): descrdir = line[9:-1] if line.startswith("DATADIR"): datadir = line[8:-1] + if line.strip().endswith("packages.gz"): uncompress = True # Fetch package information (req, dep, prov, etc) fetchitem = posixpath.join(self._baseurl, (("%s/packages") % descrdir)) - fetched = self.__fetchFile(fetchitem, fetcher, progress) + if uncompress: fetchitem += ".gz" + fetched = self.__fetchFile(fetchitem, fetcher, progress, uncompress) if not fetched or fetched.getStatus() == FAILED: return False self.removeLoaders() pkginfofile = fetched.getTargetPath() if open(pkginfofile).read(9) == "=Ver: 2.0": fetchitem = posixpath.join(self._baseurl, (("%s/packages.en") % descrdir)) - fetched = self.__fetchFile(fetchitem, fetcher, progress) + if uncompress: fetchitem += ".gz" + fetched = self.__fetchFile(fetchitem, fetcher, progress, uncompress) if not fetched or fetched.getStatus() == FAILED or open(fetched.getTargetPath()).read(9) != "=Ver: 2.0": raise Error, "YaST2 package descriptions not loaded." loader = YaST2Loader(self._baseurl, datadir, pkginfofile) ++++++ smart-broken-repo-without-summary-or-description-workaround.diff ++++++ --- /var/tmp/diff_new_pack.l29158/_old 2007-09-06 22:23:47.000000000 +0200 +++ /var/tmp/diff_new_pack.l29158/_new 2007-09-06 22:23:47.000000000 +0200 @@ -1,6 +1,6 @@ ---- smart/backends/rpm/header.py.orig 2006-07-29 01:45:12.000000000 +0200 -+++ smart/backends/rpm/header.py 2006-07-29 02:17:35.000000000 +0200 -@@ -87,22 +87,39 @@ +--- smart/backends/rpm/header.py ++++ smart/backends/rpm/header.py +@@ -90,22 +90,39 @@ return self._h[rpm.RPMTAG_SIZE] def getDescription(self): ++++++ smart-fix-archscore-add-disable-biarch-option.patch ++++++ --- /var/tmp/diff_new_pack.l29158/_old 2007-09-06 22:23:47.000000000 +0200 +++ /var/tmp/diff_new_pack.l29158/_new 2007-09-06 22:23:47.000000000 +0200 @@ -48,7 +48,7 @@ return selfver != otherver --- smart/backends/rpm/header.py +++ smart/backends/rpm/header.py -@@ -240,7 +240,7 @@ +@@ -223,7 +223,7 @@ if h[1106]: # RPMTAG_SOURCEPACKAGE continue arch = h[1022] # RPMTAG_ARCH ++++++ smart-trunk.patch ++++++ --- /var/tmp/diff_new_pack.l29158/_old 2007-09-06 22:23:47.000000000 +0200 +++ /var/tmp/diff_new_pack.l29158/_new 2007-09-06 22:23:47.000000000 +0200 @@ -1,7 +1,7 @@ Index: smart/__init__.py -=================================================================== ---- smart/__init__.py (.../tags/0.51) (Revision 880) -+++ smart/__init__.py (.../trunk) (Revision 880) +================================================================================ +--- smart/__init__.py ++++ smart/__init__.py @@ -21,13 +21,17 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # @@ -56,10 +56,35 @@ def initDistro(ctrl): # Run distribution script, if available. from smart.const import DISTROFILE -Index: smart/ccache.c -=================================================================== ---- smart/ccache.c (.../tags/0.51) (Revision 880) -+++ smart/ccache.c (.../trunk) (Revision 880) +--- smart/backends/rpm/pm.py ++++ smart/backends/rpm/pm.py +@@ -38,7 +38,7 @@ + try: + ENCODING = locale.getpreferredencoding() + except locale.Error: +- ENCODING = "C" ++ ENCODING = "ascii" + + def get_rpm_public_key(filepath): + f = file(filepath, 'r') +--- smart/cache.py ++++ smart/cache.py +@@ -644,11 +644,13 @@ + if not loader._packages: + loader.load() + self.loadFileProvides() ++ hooks.call("cache-loaded-pre-link", self) + self._objmap.clear() + self.linkDeps() + prog.setDone() + prog.show() + prog.stop() ++ hooks.call("cache-loaded", self) + + def unload(self): + self.reset() +--- smart/ccache.c ++++ smart/ccache.c @@ -128,21 +128,19 @@ PyObject *_objmap; } CacheObject; @@ -111,41 +136,8 @@ Py_RETURN_NONE; } -Index: smart/cache.py -=================================================================== ---- smart/cache.py (.../tags/0.51) (Revision 880) -+++ smart/cache.py (.../trunk) (Revision 880) -@@ -641,11 +641,13 @@ - if not loader._packages: - loader.load() - self.loadFileProvides() -+ hooks.call("cache-loaded-pre-link", self) - self._objmap.clear() - self.linkDeps() - prog.setDone() - prog.show() - prog.stop() -+ hooks.call("cache-loaded", self) - - def unload(self): - self.reset() -Index: smart/backends/rpm/pm.py -=================================================================== ---- smart/backends/rpm/pm.py (.../tags/0.51) (Revision 880) -+++ smart/backends/rpm/pm.py (.../trunk) (Revision 880) -@@ -38,7 +38,7 @@ - try: - ENCODING = locale.getpreferredencoding() - except locale.Error: -- ENCODING = "C" -+ ENCODING = "ascii" - - class RPMPackageManager(PackageManager): - -Index: smart/util/pathlocks.py -=================================================================== ---- smart/util/pathlocks.py (.../tags/0.51) (Revision 880) -+++ smart/util/pathlocks.py (.../trunk) (Revision 880) +--- smart/util/pathlocks.py ++++ smart/util/pathlocks.py @@ -35,7 +35,7 @@ self._force = flag @@ -160,10 +152,8 @@ pass return result - -Index: tests/load-hooks.txt -=================================================================== ---- tests/load-hooks.txt (.../tags/0.51) (Revision 0) -+++ tests/load-hooks.txt (.../trunk) (Revision 880) +--- tests/load-hooks.txt ++++ tests/load-hooks.txt @@ -0,0 +1,85 @@ + +In that test we'll add a couple of hooks that should be called by the ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org