Changeset 483

Timestamp:

Dec 23, 2014, 5:00:37 PM (11 years ago)

Author:

Yuri Dario

Message:

rpm: fix rebuild code. ticket#99.

Location:

rpm

Files:

• branches/rpm-4.8.1/lib/rpmdb.c (modified) (2 diffs)
• branches/rpm-4.8.1/macros.in (modified) (1 diff)
• branches/rpm-4.8.1/rpmio/rpmfileutil.c (modified) (1 diff)
• trunk/macros.in (modified) (1 diff)
• trunk/rpmio/rpmfileutil.c (modified) (1 diff)

rpm/branches/rpm-4.8.1/lib/rpmdb.c

@@ -3157 +3157 @@
     }
     dbpath = rootdbpath = rpmGetPath(prefix, tfn, NULL);
-    if (!(prefix[0] == '/' && prefix[1] == '\0'))
+    if (strcmp(prefix, "/@unixroot/"))
         dbpath += strlen(prefix) - 1;
     tfn = _free(tfn);
@@ -3169 +3169 @@
     }
     newdbpath = newrootdbpath = rpmGetPath(prefix, tfn, NULL);
-    if (!(prefix[0] == '/' && prefix[1] == '\0'))
+    if (strcmp(prefix, "/@unixroot/"))
         newdbpath += strlen(prefix) - 1;
     tfn = _free(tfn);

rpm/branches/rpm-4.8.1/macros.in

@@ -159 +159 @@
 
 #       The location of the rpm database file(s) after "rpm --rebuilddb".
-%_dbpath_rebuild        %{_var}/lib/rpm.rebuild
+%_dbpath_rebuild        %{_dbpath}
 
 %_keyringpath           %{_dbpath}/pubkeys/

rpm/branches/rpm-4.8.1/rpmio/rpmfileutil.c

@@ -403 +403 @@
     if (s[2] == ':')
         s++;
+    // clean '/@unixroot///@unixroot/...'
+    if (strncmp( s, AT_UNIXROOT "//" AT_UNIXROOT, AT_UNIXROOT_LEN*2) == 0)
+       s += (AT_UNIXROOT_LEN+2);
     // clean '/@unixroot//@unixroot/...'
     if (strncmp( s, AT_UNIXROOT "/" AT_UNIXROOT, AT_UNIXROOT_LEN*2) == 0)

rpm/trunk/macros.in

@@ -169 +169 @@
 
 #       The location of the rpm database file(s) after "rpm --rebuilddb".
-%_dbpath_rebuild        %{_var}/lib/rpm.rebuild
+%_dbpath_rebuild        %{_dbpath}
 
 %_keyringpath           %{_dbpath}/pubkeys/

rpm/trunk/rpmio/rpmfileutil.c

@@ -400 +400 @@
     if (s[2] == ':')
         s++;
+    // clean '/@unixroot///@unixroot/...'
+    if (strncmp( s, AT_UNIXROOT "//" AT_UNIXROOT, AT_UNIXROOT_LEN*2) == 0)
+       s += (AT_UNIXROOT_LEN+2);
     // clean '/@unixroot//@unixroot/...'
     if (strncmp( s, AT_UNIXROOT "/" AT_UNIXROOT, AT_UNIXROOT_LEN*2) == 0)