Merge remote-tracking branch 'matze/for-marius' into fixes

* matze/for-marius: beelib: fix expansion of SHAREDSTATEDIR variable repository: fix modes of compat scripts bee-cache-inventory: fix function _strip_trailing
mariux64 · Aug 21, 2012 · 86e9260 · 86e9260
2 parents bc83abc + 37a0c44
commit 86e9260
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 2 deletions.
diff --git a/src/bee-cache-inventory.c b/src/bee-cache-inventory.c
@@ -433,7 +433,7 @@ static void _strip_trailing(char *in, char c)
     len = strlen(in);
     p   = in+len-1;
 
-    while (p > in && *p == '/')
+    while (p > in && *p == c)
         *(p--) = 0;
 
 }

diff --git a/src/beelib.config.sh.in b/src/beelib.config.sh.in
@@ -334,7 +334,7 @@ function expand_prefix_variables() {
     expand_prefix_variables_defaults
     BEE_AUTO_EXCLUDE=""
     for var in PREFIX EPREFIX BINDIR SBINDIR LIBEXECDIR SYSCONFDIR \
-               SHAREDSTATEDIR LOCALSTATEDIR LIBDIR INCLUDEDIR \
+               LOCALSTATEDIR SHAREDSTATEDIR LIBDIR INCLUDEDIR \
                DATAROOTDIR DATADIR INFODIR LOCALEDIR MANDIR DOCDIR ; do
         eval eval ${var}=\${${var}}
         eval 'BEE_AUTO_EXCLUDE=( "${BEE_AUTO_EXCLUDE[@]}" \${${var}} )'

diff --git a/src/compat-filesfile2contentfile.sh.in b/src/compat-filesfile2contentfile.sh.in
diff --git a/src/compat-fixmetadir.sh.in b/src/compat-fixmetadir.sh.in