commit linuxrc for openSUSE:Factory
Hello community, here is the log from the commit of package linuxrc for openSUSE:Factory checked in at Wed Jul 29 17:50:49 CEST 2009. -------- --- linuxrc/linuxrc.changes 2009-06-25 18:01:32.000000000 +0200 +++ /mounts/work_src_done/STABLE/linuxrc/linuxrc.changes 2009-07-29 16:11:16.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Jul 29 16:11:08 CEST 2009 - snwint@suse.de + +- handle zypp iso url scheme (bnc #507474) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- linuxrc-3.4.3.tar.bz2 New: ---- linuxrc-3.4.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ linuxrc.spec ++++++ --- /var/tmp/diff_new_pack.RBx41m/_old 2009-07-29 17:49:43.000000000 +0200 +++ /var/tmp/diff_new_pack.RBx41m/_new 2009-07-29 17:49:43.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package linuxrc (Version 3.4.3) +# spec file for package linuxrc (Version 3.4.4) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -24,9 +24,9 @@ Group: System/Boot AutoReqProv: on Summary: SUSE Installation Program -Version: 3.4.3 +Version: 3.4.4 Release: 1 -Source: linuxrc-3.4.3.tar.bz2 +Source: linuxrc-3.4.4.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description ++++++ linuxrc-3.4.3.tar.bz2 -> linuxrc-3.4.4.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-3.4.3/Changelog new/linuxrc-3.4.4/Changelog --- old/linuxrc-3.4.3/Changelog 2009-06-25 18:00:10.000000000 +0200 +++ new/linuxrc-3.4.4/Changelog 2009-07-29 16:04:57.000000000 +0200 @@ -1,3 +1,6 @@ +29/7/2009: v3.4.4 + - handle zypp iso url scheme (bnc #507474) + 25/6/2009: v3.4.3 - removed last trace of real-root-dev (bnc #192405) - pass on DHCPTimeout to install.inf (bnc #396824) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-3.4.3/VERSION new/linuxrc-3.4.4/VERSION --- old/linuxrc-3.4.3/VERSION 2009-06-25 18:00:10.000000000 +0200 +++ new/linuxrc-3.4.4/VERSION 2009-07-29 16:03:54.000000000 +0200 @@ -1 +1 @@ -3.4.3 +3.4.4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-3.4.3/auto2.c new/linuxrc-3.4.4/auto2.c --- old/linuxrc-3.4.3/auto2.c 2009-06-25 18:00:10.000000000 +0200 +++ new/linuxrc-3.4.4/auto2.c 2009-07-29 16:06:34.000000000 +0200 @@ -81,6 +81,10 @@ ok = auto2_find_repo(); + if(config.debug) fprintf(stderr, "ZyppRepoURL: %s\n", url_print(config.url.install, 4)); + + LXRC_WAIT + util_splash_bar(50, SPLASH_50); return ok; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-3.4.3/linuxrc.c new/linuxrc-3.4.4/linuxrc.c --- old/linuxrc-3.4.3/linuxrc.c 2009-06-25 18:00:10.000000000 +0200 +++ new/linuxrc-3.4.4/linuxrc.c 2009-07-29 16:07:14.000000000 +0200 @@ -475,8 +475,6 @@ void lxrc_end() { - FILE *f; - if(config.netstop) { LXRC_WAIT diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-3.4.3/url.c new/linuxrc-3.4.4/url.c --- old/linuxrc-3.4.3/url.c 2009-06-25 18:00:10.000000000 +0200 +++ new/linuxrc-3.4.4/url.c 2009-07-29 16:09:07.000000000 +0200 @@ -723,9 +723,13 @@ } +/* + * according to zypp/media/MediaManager.h + */ char *url_print_zypp(url_t *url) { static char *buf = NULL, *s; + char *path = NULL, *file = NULL; int q = 0, scheme; // printf("start buf = %p\n", buf); @@ -733,6 +737,17 @@ str_copy(&buf, NULL); + str_copy(&path, url->path); + + if(url->is.file && path) { + if((file = strrchr(path, '/')) && *file) { + *file++ = 0; + } + else { + file = NULL; + } + } + scheme = url->scheme; if(scheme == inst_disk) { @@ -778,11 +793,11 @@ } if(url->share) strprintf(&buf, "%s/%s", buf, url->share); - if(url->path) { + if(path) { strprintf(&buf, "%s/%s%s", buf, - url->scheme == inst_ftp && *url->path == '/' ? "%2F" : "", - *url->path == '/' ? url->path + 1 : url->path + url->scheme == inst_ftp && *path == '/' ? "%2F" : "", + *path == '/' ? path + 1 : path ); } @@ -792,6 +807,12 @@ } } + if(url->is.file && file) { + strprintf(&buf, "iso:/?iso=%s&url=%s", file, buf); + } + + str_copy(&path, NULL); + // printf("end buf = %p\n", buf); // LXRC_WAIT ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de