summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorent Villard <warly@mandriva.com>2006-04-05 10:40:46 +0000
committerFlorent Villard <warly@mandriva.com>2006-04-05 10:40:46 +0000
commit7aaba46b18b98e374e7a5d1afdecd0e0666395a4 (patch)
tree658818d8df401b6ab2011d3ef42eb3047c4939bf
parentbaa6e672bae4e85fb93d0a9274671404813f9c1c (diff)
downloadmgaonline-7aaba46b18b98e374e7a5d1afdecd0e0666395a4.tar
mgaonline-7aaba46b18b98e374e7a5d1afdecd0e0666395a4.tar.gz
mgaonline-7aaba46b18b98e374e7a5d1afdecd0e0666395a4.tar.bz2
mgaonline-7aaba46b18b98e374e7a5d1afdecd0e0666395a4.tar.xz
mgaonline-7aaba46b18b98e374e7a5d1afdecd0e0666395a4.zip
fix POST not kept
-rw-r--r--mdkonline.spec8
-rwxr-xr-xmdkupdate3
2 files changed, 8 insertions, 3 deletions
diff --git a/mdkonline.spec b/mdkonline.spec
index b6d92545..1272c6de 100644
--- a/mdkonline.spec
+++ b/mdkonline.spec
@@ -1,6 +1,6 @@
%define version 2.0
%define name mdkonline
-%define release %mkrel 9
+%define release %mkrel 10
Summary: Mandriva Online Update Tool
Name: %{name}
@@ -121,6 +121,9 @@ rm -rf $RPM_BUILD_ROOT
# http://www.mandrivalinux.com/en/cvs.php3)
%changelog
+* Wed Apr 05 2006 Warly <warly@mandrakesoft.com> 2.0-10mdk
+- Correctly keep the POST line from the bundle file (for auto-select preset)
+
* Tue Apr 4 2006 Thierry Vignaud <tvignaud@mandriva.com> 2.0-9mdk
- mdkapplet: fix crash when run as non root
@@ -171,6 +174,9 @@ rm -rf $RPM_BUILD_ROOT
- add MIME support for KDE3 (it does not support the XDG mime trees
and still relies on its own mime placement) (helio)
+* Thu Mar 09 2006 Warly <warly@mandrakesoft.com> 2.0-2mdk
+- Change Soap format (Thierry Vignaud)
+
* Thu Mar 2 2006 Thierry Vignaud <tvignaud@mandriva.com> 2.0-1mdk
- mimetype association between bundle and mdkupdate (fcrozat)
- Mandriva Online V3 (daouda & me)
diff --git a/mdkupdate b/mdkupdate
index e2fa7ba3..8050ef45 100755
--- a/mdkupdate
+++ b/mdkupdate
@@ -93,7 +93,6 @@ my %options = (
);
GetOptions(%options);
-
# workaround an issue with browsers that sometimes drop the --bundle option:
$bundle = shift @ARGV if $ARGV[0] =~ /\.bundle$/;
@@ -211,7 +210,7 @@ You need to update to a newer version. You can get a new one from http://start.m
my %mirrors = add_mirrors($in, $w, $mirrors, \%bundle_vars);
install_pkgs($in, \@bundles, (find { /^bundle/ } keys %mirrors),
{ is_bundle => 1,
- auto_select => ($wc->{POST} =~ /AUTO_SELECT/ ? 1 : 0),
+ auto_select => ($bundle_vars{POST} =~ /AUTO_SELECT/ ? 1 : 0),
medias => [ keys %mirrors ],
});
} else {