aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2012-01-03 21:06:10 +0000
committerThierry Vignaud <tv@mageia.org>2012-01-03 21:06:10 +0000
commit3f034f44bfcac5a65bcc4d0c2f4cb54b6d780395 (patch)
tree00a4c2205350b80f59b6ef2c4a85489713bd2280
parent7de111b45234089eeca433c9ceba9566017beba5 (diff)
downloadiurt-3f034f44bfcac5a65bcc4d0c2f4cb54b6d780395.tar
iurt-3f034f44bfcac5a65bcc4d0c2f4cb54b6d780395.tar.gz
iurt-3f034f44bfcac5a65bcc4d0c2f4cb54b6d780395.tar.bz2
iurt-3f034f44bfcac5a65bcc4d0c2f4cb54b6d780395.tar.xz
iurt-3f034f44bfcac5a65bcc4d0c2f4cb54b6d780395.zip
let's have a sorted consistent listing in all mails
-rw-r--r--Makefile13
-rwxr-xr-xemi2
-rwxr-xr-xulri2
3 files changed, 8 insertions, 9 deletions
diff --git a/Makefile b/Makefile
index b3b5693..e3b6b98 100644
--- a/Makefile
+++ b/Makefile
@@ -17,7 +17,7 @@ libdir=/usr/lib
bindir=/usr/bin
sbindir=/usr/sbin
-localrpm: dir localcopy tar
+localrpm: localcopy tar
install:
install -d $(bindir) $(sbindir) $(INSTALLVENDORLIB)/Iurt
@@ -26,15 +26,14 @@ install:
install -m755 iurt2 $(bindir)/iurt
install -m755 emi ulri $(bindir)/
-dir:
- mkdir $(PACKAGE)-$(VERSION)
-
-tar: dir localcopy
- tar cvf $(PACKAGE)-$(VERSION).tar $(PACKAGE)-$(VERSION)
+tar:
+ tar cvf $(PACKAGE)-$(VERSION).tar --exclude=.svn --exclude=.perl_checker --exclude='*~' $(PACKAGE)-$(VERSION)
rm -rf $(PACKAGE)-$(VERSION)
localcopy:
- tar c --exclude=.svn --exclude=.perl_checker --exclude='*~' $(FILES) | tar x -C $(PACKAGE)-$(VERSION)
+ rm -fr $(PACKAGE)-$(VERSION)
+ svn export -q -rBASE . $(PACKAGE)-$(VERSION)
+ #tar c --exclude=.svn --exclude=.perl_checker --exclude='*~' $(FILES) | tar x -C $(PACKAGE)-$(VERSION)
localrpm: tar $(RPM)
cp -f $(NAME)-$(VERSION).tar $(RPM)/SOURCES
diff --git a/emi b/emi
index b8ae9c2..cc16687 100755
--- a/emi
+++ b/emi
@@ -36,7 +36,7 @@ use Iurt::File qw(check_upload_tree);
use Iurt::Util qw(plog_init plog);
use Data::Dumper;
use MDK::Common qw(cat_ if_);
-use MDK::Common::DataStructure qw(difference2);
+#use MDK::Common::DataStructure qw(difference2);
my %run;
my $program_name = 'emi';
diff --git a/ulri b/ulri
index 5ba465f..ec7f816 100755
--- a/ulri
+++ b/ulri
@@ -512,7 +512,7 @@ foreach my $prefix (keys %pkg_tree) {
$text .= "\nLog files generated:\n";
opendir my $DP1, "$fail_dir/$prefix/log/";
- foreach my $f1 (readdir $DP1) {
+ foreach my $f1 (sort(readdir($DP1))) {
if (! -d "$fail_dir/$prefix/log/$f1" || $f1 =~ m/^\./) {
next;
}