Hello community, here is the log from the commit of package procps for openSUSE:Factory checked in at Fri Jan 29 18:52:28 CET 2010. -------- --- procps/procps.changes 2009-12-15 01:32:04.000000000 +0100 +++ procps/procps.changes 2010-01-29 15:36:58.000000000 +0100 @@ -1,0 +2,7 @@ +Fri Jan 29 15:24:32 CET 2010 - werner@suse.de + +- Sysctl: ignore not existing directories in case of -e (bnc#559866) +- Ps: Ignore the environment variable $COLUMS if stdout is not a + terminal but only for $PS_PERSONALITY="posix" (bnc#497087) + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- procps-3.2.8-columns.dif procps-3.2.8-sysctlerr.dif ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ procps.spec ++++++ --- /var/tmp/diff_new_pack.8AHEAx/_old 2010-01-29 18:51:59.000000000 +0100 +++ /var/tmp/diff_new_pack.8AHEAx/_new 2010-01-29 18:51:59.000000000 +0100 @@ -27,7 +27,7 @@ PreReq: %fillup_prereq %insserv_prereq AutoReqProv: on Version: 3.2.8 -Release: 7 +Release: 8 Summary: ps utilities for /proc Provides: ps Obsoletes: ps @@ -63,6 +63,8 @@ Patch27: procps-3.2.7-terabyte.dif Patch28: procps-3.2.6-xen.dif Patch29: procps-3.2.8-fdleak.dif +Patch30: procps-3.2.8-sysctlerr.dif +Patch31: procps-3.2.8-columns.dif BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -120,6 +122,8 @@ %patch27 %patch28 %patch29 +%patch30 +%patch31 %build make %{?jobs:-j%jobs} CFLAGS="-Wall -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 $RPM_OPT_FLAGS -pipe" \ ++++++ procps-3.2.8-columns.dif ++++++ --- ps/global.c +++ ps/global.c 2009-11-17 16:59:38.279430039 +0000 @@ -139,8 +139,12 @@ static void set_screen_size(void){ screen_cols = ws.ws_col; // hmmm, NetBSD subtracts 1 screen_rows = ws.ws_row; - // TODO: delete this line - if(!isatty(STDOUT_FILENO)) screen_cols = OUTBUF_SIZE; + // override COLUMNS setting if not a tty + if(!isatty(STDOUT_FILENO)){ + screen_cols = OUTBUF_SIZE; + screen_rows = OUTBUF_SIZE; + if (personality&PER_UNIX_COLS) return; // SysV/UNIX98 based personality + } columns = getenv("COLUMNS"); if(columns && *columns){ @@ -286,6 +290,7 @@ static const char *set_personality(void) return NULL; case_aix: + personality |= PER_UNIX_COLS; bsd_j_format = "FB_j"; bsd_l_format = "FB_l"; /* bsd_s_format not used */ @@ -313,6 +318,7 @@ static const char *set_personality(void) case_sunos4: personality = PER_NO_DEFAULT_g; + personality |= PER_UNIX_COLS; prefer_bsd_defaults = 1; bsd_j_format = "FB_j"; bsd_l_format = "FB_l"; @@ -337,12 +343,14 @@ static const char *set_personality(void) case_hp: case_hpux: personality = PER_BROKEN_o | PER_HPUX_x; + personality |= PER_UNIX_COLS; return NULL; case_svr4: case_sysv: case_sco: personality = PER_BROKEN_o | PER_SVR4_x; + personality |= PER_UNIX_COLS; return NULL; case_posix: @@ -351,6 +359,7 @@ static const char *set_personality(void) case_unix98: case_unix: personality = PER_BROKEN_o; + personality |= PER_UNIX_COLS; return NULL; } @@ -361,8 +370,8 @@ void reset_global(void){ double uptime_secs; reset_selection_list(); look_up_our_self(&p); - set_screen_size(); set_personality(); + set_screen_size(); all_processes = 0; bsd_c_option = 0; ++++++ procps-3.2.8-sysctlerr.dif ++++++ --- sysctl.c +++ sysctl.c 2010-01-29 14:22:55.119429196 +0000 @@ -146,8 +146,10 @@ static int ReadSetting(const char *restr slashdot(outname,'/','.'); /* change / to . */ if (stat(tmpname, &ts) < 0) { - perror(tmpname); - rc = -1; + if (!IgnoreError) { + perror(tmpname); + rc = -1; + } goto out; } if ((ts.st_mode & S_IRUSR) == 0) @@ -322,8 +324,10 @@ static int WriteSetting(const char *sett slashdot(outname,'/','.'); /* change / to . */ if (stat(tmpname, &ts) < 0) { - perror(tmpname); - rc = -1; + if (!IgnoreError) { + perror(tmpname); + rc = -1; + } goto out; } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org