[PATCH] ipkg-utils: convert mtime to int before comparing it

[PATCH] ipkg-utils: convert mtime to int before comparing it

[Enrico Scholz]

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>
---
 .../ipkg-utils-native_1.6+cvs20050404.bb           |    2 +-
 .../ipkg-utils/ipkg-make-index-track-stamps.patch  |    2 +-
 recipes/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb   |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

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 98cc7f1..11e124b 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 = "r22"
+PR = "r23"
 
 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 ad6df4f..68758ed 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 fe1f28b..aa2bfbb 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 = "r25"
+PR = "r26"
 
 SRC_URI = "${HANDHELDS_CVS};module=ipkg-utils \
            file://ipkg-utils-fix.patch \
-- 
1.7.0.1

Re: [PATCH] ipkg-utils: convert mtime to int before comparing it

[Khem Raj]

On (15/06/10 15:03), Enrico Scholz wrote:
> The st_mtime attribute (which is a float) is compared against a value
> from the timestamp database, which was stored as an integer there.


Is it stored as integer or long int? Did you try it on x86_64 box.
> 
> 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>
> ---
>  .../ipkg-utils-native_1.6+cvs20050404.bb           |    2 +-
>  .../ipkg-utils/ipkg-make-index-track-stamps.patch  |    2 +-
>  recipes/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb   |    2 +-
>  3 files changed, 3 insertions(+), 3 deletions(-)
> 
> 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 98cc7f1..11e124b 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 = "r22"
> +PR = "r23"
>  
>  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 ad6df4f..68758ed 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 fe1f28b..aa2bfbb 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 = "r25"
> +PR = "r26"
>  
>  SRC_URI = "${HANDHELDS_CVS};module=ipkg-utils \
>             file://ipkg-utils-fix.patch \
> -- 
> 1.7.0.1
> 
> 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

Re: [PATCH] ipkg-utils: convert mtime to int before comparing it

[Enrico Scholz]

Khem Raj <raj.khem@gmail.com> writes:

> On (15/06/10 15:03), Enrico Scholz wrote:
>> The st_mtime attribute (which is a float) is compared against a value
>> from the timestamp database, which was stored as an integer there.
>
>
> Is it stored as integer or long int? Did you try it on x86_64 box.

As 'int'. The ipkg-make-index-track-stamps.patch stores them as

+    pkgsStamps[basename] = fnameStat.st_mtime
     ...
+    pkgsStampsFile.write("%d %s\n" % (pkgsStamps[f], f))

and reads them back as

+            s, f = l.split(" ", 1)
+            pkgsStamps[f] = int(s)


> -+          if pkgsStamps.has_key(basename) and fnameStat.st_mtime == pkgsStamps[basename]:
> ++          if pkgsStamps.has_key(basename) and int(fnameStat.st_mtime) == pkgsStamps[basename]:



Enrico

Re: [PATCH] ipkg-utils: convert mtime to int before comparing it

[Khem Raj]

On (21/06/10 20:31), Enrico Scholz wrote:
> Khem Raj <raj.khem@gmail.com> writes:
> 
> > On (15/06/10 15:03), Enrico Scholz wrote:
> >> The st_mtime attribute (which is a float) is compared against a value
> >> from the timestamp database, which was stored as an integer there.
> >
> >
> > Is it stored as integer or long int? Did you try it on x86_64 box.
> 
> As 'int'. The ipkg-make-index-track-stamps.patch stores them as
> 
> +    pkgsStamps[basename] = fnameStat.st_mtime
>      ...
> +    pkgsStampsFile.write("%d %s\n" % (pkgsStamps[f], f))
> 
> and reads them back as
> 
> +            s, f = l.split(" ", 1)
> +            pkgsStamps[f] = int(s)
> 
> 

OK

Acked-by: Khem Raj <raj.khem@gmail.com>


> > -+          if pkgsStamps.has_key(basename) and fnameStat.st_mtime == pkgsStamps[basename]:
> > ++          if pkgsStamps.has_key(basename) and int(fnameStat.st_mtime) == pkgsStamps[basename]:
> 
> 
> 
> Enrico