summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2013-11-28 15:23:45 +0100
committerThierry Vignaud <thierry.vignaud@gmail.com>2013-11-28 15:24:21 +0100
commita79fe755f730aaa3e1a1a613cd77730f0f0f1eb3 (patch)
treed7723ff9a47639ef8768e0cd30fd3620648f9f90
parentdc07d338ea678744280d4bfd46053407dcdec68a (diff)
downloaddrakwizard-a79fe755f730aaa3e1a1a613cd77730f0f0f1eb3.tar
drakwizard-a79fe755f730aaa3e1a1a613cd77730f0f0f1eb3.tar.gz
drakwizard-a79fe755f730aaa3e1a1a613cd77730f0f0f1eb3.tar.bz2
drakwizard-a79fe755f730aaa3e1a1a613cd77730f0f0f1eb3.tar.xz
drakwizard-a79fe755f730aaa3e1a1a613cd77730f0f0f1eb3.zip
drop SVN bits
-rw-r--r--Makefile23
1 files changed, 1 insertions, 22 deletions
diff --git a/Makefile b/Makefile
index 3e2c2260..92df03e3 100644
--- a/Makefile
+++ b/Makefile
@@ -64,31 +64,10 @@ dist: clean
find . -maxdepth 2 -name '*.p[lm]' -print0 | xargs -t -0 -n1 perl -cw \
-I/usr/lib/libDrakX > /dev/null 2>&1
rm -rf ../$(NAME)-$(VERSION).tar*
- @if [ -e ".svn" ]; then \
- $(MAKE) dist-svn; \
- elif [ -e ".git" ]; then \
- $(MAKE) dist-git; \
- else \
- echo "Unknown SCM (not SVN nor GIT)";\
- exit 1; \
- fi;
- $(info $(NAME)-$(VERSION).tar.xz is ready)
-
-dist-svn:
- rm -rf $(NAME)-$(VERSION)
- svn export -q -rBASE . $(NAME)-$(VERSION)
- tar cfa ../$(NAME)-$(VERSION).tar.xz $(NAME)-$(VERSION)
- rm -rf $(NAME)-$(VERSION)
-
-dist-git:
@git archive --prefix=$(NAME)-$(VERSION)/ HEAD | xz >../$(NAME)-$(VERSION).tar.xz;
+ $(info $(NAME)-$(VERSION).tar.xz is ready)
log: changelog
-changelog:
- ( svn2cl --authors=../../common/username --accum ; \
- rm -f ChangeLog.bak ; \
- svn commit -m "Generated by svn2cl the `date '+%c'`" ChangeLog ; \
- )
clean_test:
rm -rf test
drakx/diff/?h=18.26&id=c7fc02ade71cad25b5b749ec1473c836f3dc7e10'>Diffstat
-rw-r--r--perl-install/install/NEWS3
-rw-r--r--perl-install/install/install2.pm2
-rw-r--r--perl-install/lang.pm8
3 files changed, 12 insertions, 1 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index cc4255a35..9b6b654f6 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,6 @@
+- correctly set country when given lang=xxx on /proc/cmdline
+ (regression introduced in 10.16) (#39104)
+
Version 10.18 - 21 March 2008
- when reformatting swap, keep existing UUID (#38877)
diff --git a/perl-install/install/install2.pm b/perl-install/install/install2.pm
index 9f2dda1cc..ab09f0874 100644
--- a/perl-install/install/install2.pm
+++ b/perl-install/install/install2.pm
@@ -522,7 +522,7 @@ sub main {
#- for auto_install compatibility with old $o->{lang},
#- and also for --lang and --flang
if ($o->{lang}) {
- put_in_hash($o->{locale}, lang::system_locales_to_ourlocale($o->{lang}, $o->{lang}));
+ put_in_hash($o->{locale}, lang::lang_to_ourlocale($o->{lang}));
}
lang::set($o->{locale});
diff --git a/perl-install/lang.pm b/perl-install/lang.pm
index 6e1dfbcfc..28b447e95 100644
--- a/perl-install/lang.pm
+++ b/perl-install/lang.pm
@@ -1037,6 +1037,14 @@ sub system_locales_to_ourlocale {
$locale;
}
+sub lang_to_ourlocale {
+ my ($lang) = @_;
+
+ my $locale = system_locales_to_ourlocale($lang);
+ lang_changed($locale);
+ $locale;
+}
+
sub lang_changed {
my ($locale) = @_;
my $h = analyse_locale_name(l2locale($locale->{lang}));