diff options
| -rw-r--r-- | Makefile | 13 | ||||
| -rwxr-xr-x | emi | 2 | ||||
| -rwxr-xr-x | ulri | 2 |
3 files changed, 8 insertions, 9 deletions
@@ -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 @@ -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'; @@ -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; } |