Make sinfo -a and -p overwrite env variables but not command line.

Error on -a and -p being specified on the same line.
Bug 1201