summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHerb Lewis <herb@samba.org>1998-04-28 18:58:20 +0000
committerHerb Lewis <herb@samba.org>1998-04-28 18:58:20 +0000
commit1a25f56066f950f20cd2ee8cbb15d62ecb9ecc61 (patch)
tree6220ad69dea2b83dec84fe7889d59d3710c0220e
parentb807469d40a816e9f61b797b6ab26a40bb4363cb (diff)
downloadsamba-1a25f56066f950f20cd2ee8cbb15d62ecb9ecc61.tar.gz
samba-1a25f56066f950f20cd2ee8cbb15d62ecb9ecc61.tar.bz2
samba-1a25f56066f950f20cd2ee8cbb15d62ecb9ecc61.zip
fix problem with output file not being properly sorted
(This used to be commit d13678b079faf0da91b4ef582481fb987d377c8a)
-rwxr-xr-xpackaging/SGI/idb.pl9
1 files changed, 3 insertions, 6 deletions
diff --git a/packaging/SGI/idb.pl b/packaging/SGI/idb.pl
index 788b77819b..51ba1df7d3 100755
--- a/packaging/SGI/idb.pl
+++ b/packaging/SGI/idb.pl
@@ -121,8 +121,6 @@ while (@docs) {
next if ($nextfile eq "CVS");
($junk,$file) = split(/\//,$nextfile,2);
if (grep(/\/$/,$nextfile)) {
- chop $nextfile;
- chop $file;
print IDB "d 0755 root sys usr/samba/docs/$file $nextfile samba.man.doc\n";
}
else {
@@ -143,14 +141,14 @@ print IDB "f 0644 root sys usr/samba/lib/smb.conf packaging/SGI/smb.conf samba.s
print IDB "f 0755 root sys usr/samba/mkprintcap.sh packaging/SGI/mkprintcap.sh samba.sw.base\n";
print IDB "d 0755 root sys usr/samba/src packaging/SGI samba.src.samba\n";
-while (@allfiles) {
- $nextfile = shift @allfiles;
+@sorted = sort(@allfiles);
+while (@sorted) {
+ $nextfile = shift @sorted;
($file = $nextfile) =~ s/^.*\///;
next if grep(/packaging\/SGI/& (/Makefile/ | /samba\.spec/ | /samba\.idb/),$nextfile);
next if grep(/source/,$nextfile) && ($ignores{$file});
next if ($nextfile eq "CVS");
if (grep(/\/$/,$nextfile)) {
- chop $nextfile;
print IDB "d 0755 root sys usr/samba/src/$nextfile $nextfile samba.src.samba\n";
}
else {
@@ -169,7 +167,6 @@ while (@swatfiles) {
($file = $nextfile) =~ s/^packaging\/SGI\/swat\///;
next if !$file;
if (grep(/\/$/,$file)) {
- chop $file;
print IDB "d 0755 root sys usr/samba/swat/$file packaging/SGI/swat/$file samba.sw.base\n";
}
else {