From: Enrico Scholz <enrico.scholz@sigma-chemnitz.de>
Date: Tue, 15 Jun 2010 12:43:54 +0000 (+0200)
Subject: ipkg-utils: convert mtime to int before comparing it
X-Git-Tag: sz_173~29
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2a03265f1550da05e2b145e0463792dc7388c14d;p=openembedded.git

ipkg-utils: convert mtime to int before comparing it

The st_mtime attribute (which is a float) is compared against a value
from the timestamp database, which was stored as an integer there.

When working on a filesystem with precise timestamps the comparision
will fail nearly everytime hence.

Although it might be possible to enhance the database to store the
fractional part too, this will complicate things more than we would
gain by this change.

Signed-off-by: Enrico Scholz <enrico.scholz@sigma-chemnitz.de>
---

diff --git a/recipes/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb b/recipes/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb
index 19eb6f87ce..3a6aaed143 100644
--- a/recipes/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb
+++ b/recipes/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb
@@ -1,7 +1,7 @@
 require ipkg-utils_${PV}.bb
 
 RDEPENDS_${PN} = ""
-PR = "r24"
+PR = "r25"
 
 inherit native
 
diff --git a/recipes/ipkg-utils/ipkg-utils/ipkg-make-index-track-stamps.patch b/recipes/ipkg-utils/ipkg-utils/ipkg-make-index-track-stamps.patch
index ad6df4f2e9..68758ed76c 100644
--- a/recipes/ipkg-utils/ipkg-utils/ipkg-make-index-track-stamps.patch
+++ b/recipes/ipkg-utils/ipkg-utils/ipkg-make-index-track-stamps.patch
@@ -53,7 +53,7 @@ Index: ipkg-utils/ipkg-make-index
 +     fnameStat = os.stat(filename)
       if old_pkg_hash.has_key(basename):
 -          if (verbose):
-+          if pkgsStamps.has_key(basename) and fnameStat.st_mtime == pkgsStamps[basename]:
++          if pkgsStamps.has_key(basename) and int(fnameStat.st_mtime) == pkgsStamps[basename]:
 +            if (verbose):
                 sys.stderr.write("Found %s in Packages\n" % (filename,))
 -          pkg = old_pkg_hash[basename]
diff --git a/recipes/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb b/recipes/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb
index 5350da8016..cdb8355833 100644
--- a/recipes/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb
+++ b/recipes/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb
@@ -5,7 +5,7 @@ LICENSE = "GPL"
 CONFLICTS = "ipkg-link"
 RDEPENDS_${PN} = "python"
 SRCDATE = "20050930"
-PR = "r26"
+PR = "r27"
 
 TARGET_CC_ARCH += "${LDFLAGS}"