Mailinglist Archive: opensuse-commit (2092 mails)

< Previous Next >
commit smart
  • From: root@xxxxxxxxxxxxxxx (h_root)
  • Date: Wed, 29 Aug 2007 22:44:36 +0200
  • Message-id: <20070829204436.AF01E6781B8@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package smart
checked in at Wed Aug 29 22:44:36 CEST 2007.

--------
--- smart/smart.changes 2007-08-07 13:14:45.000000000 +0200
+++ /mounts/work_src_done/STABLE/smart/smart.changes    2007-08-29 20:31:13.000897000 +0200
@@ -1,0 +2,13 @@
+Wed Aug 29 20:09:54 CEST 2007 - cthiel@xxxxxxx
+
+- updated smart-fix-archscore-add-disable-biarch-option.patch and
+  smart-better-x86_64-support.patch to include improvements by Maciej
+  Kowalczyk
+- updated smart-trunk.patch to r880
+
+-------------------------------------------------------------------
+Tue Aug  7 17:16:01 CEST 2007 - cthiel@xxxxxxx
+
+- added smart-channelsync.patch: adds .repo support
+
+-------------------------------------------------------------------

New:
----
  smart-channelsync.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ smart.spec ++++++
--- /var/tmp/diff_new_pack.b23023/_old  2007-08-29 22:43:59.000000000 +0200
+++ /var/tmp/diff_new_pack.b23023/_new  2007-08-29 22:43:59.000000000 +0200
@@ -20,7 +20,7 @@
 %endif
 Summary:        Smart Package Manager
 Version:        0.51
-Release:        32
+Release:        41
 Source:         %{name}-%{version}.tar.bz2
 Source1:        distro.py
 Source2:        %{name}.desktop
@@ -36,6 +36,7 @@
 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
+Patch103:       %{name}-channelsync.patch
 Patch999:       %{name}-trunk.patch
 URL:            http://smartpm.org
 Group:          System/Packages
@@ -106,6 +107,7 @@
 %patch100
 %patch101
 %patch102
+%patch103
 %patch999
 
 %build
@@ -214,6 +216,13 @@
 /opt/kde3/share/apps/konqueror
 
 %changelog
+* Wed Aug 29 2007 - cthiel@xxxxxxx
+- updated smart-fix-archscore-add-disable-biarch-option.patch and
+  smart-better-x86_64-support.patch to include improvements by Maciej
+  Kowalczyk
+- updated smart-trunk.patch to r880
+* Tue Aug 07 2007 - cthiel@xxxxxxx
+- added smart-channelsync.patch: adds .repo support
 * Tue Aug 07 2007 - cthiel@xxxxxxx
 - readded smart-trunk.patch (r877), implements cache-loaded and
   cache-loaded-pre-link hooks


++++++ smart-better-x86_64-support.patch ++++++
--- /var/tmp/diff_new_pack.b23023/_old  2007-08-29 22:43:59.000000000 +0200
+++ /var/tmp/diff_new_pack.b23023/_new  2007-08-29 22:43:59.000000000 +0200
@@ -1,27 +1,75 @@
---- smart/backends/rpm/base.py.orig    2006-12-04 17:38:26.000000000 +0100
-+++ smart/backends/rpm/base.py 2006-11-22 00:44:44.000000000 +0100
-@@ -185,9 +185,22 @@
+--- smart/backends/rpm/base.py
++++ smart/backends/rpm/base.py
+@@ -41,6 +41,8 @@
+         traceback.print_exc()
+     raise Error, _("'rpm' python module is not available")

++system_is_x86_64 = os.uname()[4] == 'x86_64'
++
+ archscores = {}

+ def archscore(arch):
+@@ -100,7 +102,12 @@

+ class RPMPackage(Package):

+-    __slots__ = ()
++    __slots__ = ('ver', 'archscore', 'arch_is_not_x86_64')
++    def __init__(self, name, version):
++        Package.__init__(self, name, version)
++        self.ver, arch = splitarch(self.version)
++        self.archscore = archscore(arch)
++        self.arch_is_not_x86_64 = arch != 'x86_64'

+     packagemanager = RPMPackageManager

+@@ -200,16 +207,37 @@
+         if ratio:
+             searcher.addResult(self, ratio)

++    def __setstate__(self, state):
++        Package.__setstate__(self, state)
++        self.ver, arch = splitarch(self.version)
++        self.archscore = archscore(arch)
++        self.arch_is_not_x86_64 = arch != 'x86_64'
++
++    def __getstate__(self):
++        state = Package.__getstate__(self)
++        return state
++
      def __lt__(self, other):
          rc = cmp(self.name, other.name)
          if type(other) is RPMPackage:
-+            selfver, selfarch = splitarch(self.version)
-+            otherver, otherarch = splitarch(other.version)
-+            if archscore(selfarch) == 0:
++            if self.archscore == 0:
 +                return True
-+            if archscore(otherarch) == 0:
++            if other.archscore == 0:
 +                return False
-+            if os.uname()[4] == 'x86_64':
-+                if selfarch != 'x86_64' and otherarch != 'x86_64':
++            if system_is_x86_64:
++                if self.arch_is_not_x86_64 and other.arch_is_not_x86_64:
 +                    pass
 +                else:
-+                    if selfarch != 'x86_64':
++                    if self.arch_is_not_x86_64:
 +                        return True
-+                    if otherarch != 'x86_64':
++                    if other.arch_is_not_x86_64:
 +                        return False
 +                             
              if rc == 0 and self.version != other.version:
 -                selfver, selfarch = splitarch(self.version)
 -                otherver, otherarch = splitarch(other.version)
-                 if selfver != otherver:
+-                if selfver != otherver:
++                if self.ver != other.ver:
                      rc = vercmp(self.version, other.version)
                  if rc == 0:
+-                    rc = -cmp(archscore(selfarch), archscore(otherarch))
++                    rc = -cmp(self.archscore, other.archscore)
+         return rc == -1

+ class RPMProvides(Provides):         __slots__ = ()
+@@ -288,6 +316,7 @@
+     psyco.bind(RPMPackage.coexists)
+     psyco.bind(RPMPackage.matches)
+     psyco.bind(RPMPackage.search)
++    psyco.bind(RPMPackage.__setstate__)
+     psyco.bind(RPMPackage.__lt__)
+     psyco.bind(RPMDepends.matches)
+     psyco.bind(RPMObsoletes.matches)

++++++ smart-channelsync.patch ++++++
--- smart/plugins/channelsync.py
+++ smart/plugins/channelsync.py
@@ -35,7 +35,7 @@
         seenalias = {}
 
         for entry in os.listdir(channelsdir):
-            if not entry.endswith(".channel"):
+            if not (entry.endswith(".channel") or entry.endswith(".repo")):
                 continue
 
             filepath = os.path.join(channelsdir, entry)

++++++ smart-fix-archscore-add-disable-biarch-option.patch ++++++
--- /var/tmp/diff_new_pack.b23023/_old  2007-08-29 22:44:00.000000000 +0200
+++ /var/tmp/diff_new_pack.b23023/_new  2007-08-29 22:44:00.000000000 +0200
@@ -1,16 +1,19 @@
 --- smart/backends/rpm/base.py
 +++ smart/backends/rpm/base.py
-@@ -41,11 +41,16 @@
+@@ -41,11 +41,19 @@
          traceback.print_exc()
      raise Error, _("'rpm' python module is not available")
  
 -archscore = rpm.archscore
++archscores = {}
++
 +def archscore(arch):
-+    if sysconf.get("rpm-enable-biarch", True):
-+      return rpm.archscore(arch)
-+    if os.uname()[4] == 'x86_64' and arch != 'x86_64':
-+        return 0
-+    return rpm.archscore(arch)
++    if not arch in archscores:
++        if not sysconf.get("rpm-enable-biarch", True) and os.uname()[4] == 'x86_64' and arch != 'x86_64':
++            archscores[arch] = 0
++        else:
++            archscores[arch] = rpm.archscore(arch)
++    return archscores[arch]
  
  __all__ = ["RPMPackage", "RPMProvides", "RPMNameProvides", "RPMPreRequires",
             "RPMRequires", "RPMUpgrades", "RPMConflicts", "RPMObsoletes",
@@ -19,7 +22,7 @@
  
  def getTS(new=False):
      if not hasattr(getTS, "ts"):
-@@ -99,6 +104,11 @@
+@@ -99,6 +107,11 @@
      def equals(self, other):
          if self.name != other.name or self.version != other.version:
              return False
@@ -31,7 +34,7 @@
          if Package.equals(self, other):
              return True
          fk = dict.fromkeys
-@@ -141,8 +151,9 @@
+@@ -141,8 +154,9 @@
              return False
          selfver, selfarch = splitarch(self.version)
          otherver, otherarch = splitarch(other.version)
@@ -45,7 +48,7 @@
          return selfver != otherver
 --- smart/backends/rpm/header.py
 +++ smart/backends/rpm/header.py
-@@ -223,7 +223,7 @@
+@@ -240,7 +240,7 @@
              if h[1106]: # RPMTAG_SOURCEPACKAGE
                  continue
              arch = h[1022] # RPMTAG_ARCH



++++++ smart-trunk.patch ++++++
--- /var/tmp/diff_new_pack.b23023/_old  2007-08-29 22:44:00.000000000 +0200
+++ /var/tmp/diff_new_pack.b23023/_new  2007-08-29 22:44:00.000000000 +0200
@@ -1,7 +1,65 @@
+Index: smart/__init__.py
+===================================================================
+--- smart/__init__.py  (.../tags/0.51) (Revision 880)
++++ smart/__init__.py  (.../trunk)     (Revision 880)
+@@ -21,13 +21,17 @@
+ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ #
+ from gettext import translation
+-from smart.hook import Hooks
++import thread
+ import locale
+ import sys
+ import os

++from smart.hook import Hooks
++
++
+ __all__ = ["sysconf", "pkgconf", "iface", "hooks", "Error", "_"]

++
+ class Error(Exception):
+     def __init__(self, msg=None):
+         if not msg:
+@@ -82,6 +86,12 @@
+ iface = Proxy()
+ hooks = Hooks()

++
++# For now, the Smart library only allows one instance of the system
++# to be run at a time per-process.
++_smart_run_lock = thread.allocate_lock()
++
++
+ def init(command=None, argv=None,
+          datadir=None, configfile=None,
+          gui=False, shell=False, interface=None,
+@@ -94,6 +104,8 @@
+     from smart.interface import Interface
+     from smart.control import Control

++    _smart_run_lock.acquire()
++
+     iface.object = Interface(None)
+     sysconf.object = SysConfig()
+     pkgconf.object = PkgConfig(sysconf.object)
+@@ -146,6 +158,12 @@
+     sysconf.object = None
+     pkgconf.object = None

++    _smart_run_lock.release()
++
++def initialized():
++    return _smart_run_lock.locked()
++
++
+ def initDistro(ctrl):
+     # Run distribution script, if available.
+     from smart.const import DISTROFILE
 Index: smart/ccache.c
 ===================================================================
---- smart/ccache.c     (.../tags/0.51) (revision 877)
-+++ smart/ccache.c     (.../trunk)     (revision 877)
+--- smart/ccache.c     (.../tags/0.51) (Revision 880)
++++ smart/ccache.c     (.../trunk)     (Revision 880)
 @@ -128,21 +128,19 @@
      PyObject *_objmap;
  } CacheObject;
@@ -55,8 +113,8 @@
  
 Index: smart/cache.py
 ===================================================================
---- smart/cache.py     (.../tags/0.51) (revision 877)
-+++ smart/cache.py     (.../trunk)     (revision 877)
+--- smart/cache.py     (.../tags/0.51) (Revision 880)
++++ smart/cache.py     (.../trunk)     (Revision 880)
 @@ -641,11 +641,13 @@
              if not loader._packages:
                  loader.load()
@@ -73,8 +131,8 @@
          self.reset()
 Index: smart/backends/rpm/pm.py
 ===================================================================
---- smart/backends/rpm/pm.py   (.../tags/0.51) (revision 877)
-+++ smart/backends/rpm/pm.py   (.../trunk)     (revision 877)
+--- 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()
@@ -84,10 +142,28 @@
  
  class RPMPackageManager(PackageManager):
  
+Index: smart/util/pathlocks.py
+===================================================================
+--- smart/util/pathlocks.py    (.../tags/0.51) (Revision 880)
++++ smart/util/pathlocks.py    (.../trunk)     (Revision 880)
+@@ -35,7 +35,7 @@
+         self._force = flag

+     def __del__(self):
+-        # fcntl module may be destructed before we do.
++        # fcntl module may be destructed before we are.
+         if fcntl: self.unlockAll()

+     def unlockAll(self):
+@@ -75,4 +75,3 @@
+         except IOError, e:
+             pass
+         return result
+-
 Index: tests/load-hooks.txt
 ===================================================================
---- tests/load-hooks.txt       (.../tags/0.51) (revision 0)
-+++ tests/load-hooks.txt       (.../trunk)     (revision 877)
+--- tests/load-hooks.txt       (.../tags/0.51) (Revision 0)
++++ tests/load-hooks.txt       (.../trunk)     (Revision 880)
 @@ -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@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread